diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index 3492fe7c14..f025b60eea 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -80,7 +80,7 @@ export class AuthController {
 				user = preliminaryUser;
 				usedAuthenticationMethod = 'email';
 			} else {
-				throw new AuthError('SAML is enabled, please log in with SAML');
+				throw new AuthError('SSO is enabled, please log in with SSO');
 			}
 		} else if (isLdapCurrentAuthenticationMethod()) {
 			user = await handleLdapLogin(email, password);
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/index.ts b/packages/editor-ui/src/__tests__/server/endpoints/index.ts
index 4ba3315e42..d79a81d308 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/index.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/index.ts
@@ -4,6 +4,7 @@ import { routesForCredentials } from './credential';
 import { routesForCredentialTypes } from './credentialType';
 import { routesForVariables } from './variable';
 import { routesForSettings } from './settings';
+import { routesForSSO } from './sso';
 
 const endpoints: Array<(server: Server) => void> = [
 	routesForCredentials,
@@ -11,6 +12,7 @@ const endpoints: Array<(server: Server) => void> = [
 	routesForUsers,
 	routesForVariables,
 	routesForSettings,
+	routesForSSO,
 ];
 
 export { endpoints };
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
new file mode 100644
index 0000000000..61896ca1f7
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
@@ -0,0 +1,36 @@
+import type { Server, Request } from 'miragejs';
+import { Response } from 'miragejs';
+import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
+import { faker } from '@faker-js/faker';
+import type { AppSchema } from '@/__tests__/server/types';
+import { jsonParse } from 'n8n-workflow';
+
+let samlConfig: SamlPreferences & SamlPreferencesExtractedData = {
+	metadata: '<?xml version="1.0"?>',
+	metadataUrl: '',
+	entityID: faker.internet.url(),
+	returnUrl: faker.internet.url(),
+};
+
+export function routesForSSO(server: Server) {
+	server.get('/rest/sso/saml/config', () => {
+		return new Response(200, {}, { data: samlConfig });
+	});
+
+	server.post('/rest/sso/saml/config', (schema: AppSchema, request: Request) => {
+		const requestBody = jsonParse(request.requestBody) as Partial<
+			SamlPreferences & SamlPreferencesExtractedData
+		>;
+
+		samlConfig = {
+			...samlConfig,
+			...requestBody,
+		};
+
+		return new Response(200, {}, { data: samlConfig });
+	});
+
+	server.get('/rest/sso/saml/config/test', () => {
+		return new Response(200, {}, { data: '<?xml version="1.0"?>' });
+	});
+}
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
index f6f7797090..9fa734192d 100644
--- a/packages/editor-ui/src/__tests__/utils.ts
+++ b/packages/editor-ui/src/__tests__/utils.ts
@@ -3,7 +3,7 @@ import { UserManagementAuthenticationMethod } from '@/Interface';
 import { render } from '@testing-library/vue';
 import { PiniaVuePlugin } from 'pinia';
 
-export const retry = async (assertion: () => any, { interval = 20, timeout = 200 } = {}) => {
+export const retry = async (assertion: () => any, { interval = 20, timeout = 1000 } = {}) => {
 	return new Promise((resolve, reject) => {
 		const startTime = Date.now();
 
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 20c5415fbe..99df8a2ae5 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1797,22 +1797,32 @@
 	"settings.ldap.section.synchronization.title": "Synchronization",
 	"settings.sso": "SSO",
 	"settings.sso.title": "Single Sign On",
-	"settings.sso.subtitle": "SAML 2.0",
-	"settings.sso.info": "SAML SSO (Security Assertion Markup Language Single Sign-On) is a type of authentication process that enables users to access multiple applications with a single set of login credentials. {link}",
-	"settings.sso.info.link": "More info.",
+	"settings.sso.subtitle": "SAML 2.0 Configuration",
+	"settings.sso.info": "Activate SAML SSO to enable passwordless login via your existing user management tool and enhance security through unified authentication.",
+	"settings.sso.info.link": "Learn how to configure SAML 2.0.",
 	"settings.sso.activation.tooltip": "You need to save the settings first before activating SAML",
 	"settings.sso.activated": "Activated",
 	"settings.sso.deactivated": "Deactivated",
 	"settings.sso.settings.redirectUrl.label": "Redirect URL",
 	"settings.sso.settings.redirectUrl.copied": "Redirect URL copied to clipboard",
-	"settings.sso.settings.redirectUrl.help": "Save the Redirect URL as you’ll need it to configure these in the SAML provider’s settings.",
+	"settings.sso.settings.redirectUrl.help": "Copy the Redirect URL to configure your SAML provider",
 	"settings.sso.settings.entityId.label": "Entity ID",
 	"settings.sso.settings.entityId.copied": "Entity ID copied to clipboard",
-	"settings.sso.settings.entityId.help": "Save the Entity URL as you’ll need it to configure these in the SAML provider’s settings.",
+	"settings.sso.settings.entityId.help": "Copy the Entity ID URL to configure your SAML provider",
 	"settings.sso.settings.ips.label": "Identity Provider Settings",
-	"settings.sso.settings.ips.help": "Add the raw Metadata XML provided by your Identity Provider",
+	"settings.sso.settings.ips.xml.help": "Paste here the raw Metadata XML provided by your Identity Provider",
+	"settings.sso.settings.ips.url.help": "Paste here the Internet Provider Metadata URL",
+	"settings.sso.settings.ips.url.placeholder": "e.g. https://samltest.id/saml/idp",
+	"settings.sso.settings.ips.options.url": "Metadata URL",
+	"settings.sso.settings.ips.options.xml": "XML",
 	"settings.sso.settings.test": "Test settings",
 	"settings.sso.settings.save": "Save settings",
+	"settings.sso.settings.save.activate.title": "Test and activate SAML SSO",
+	"settings.sso.settings.save.activate.message": "SAML SSO configuration saved successfully. Test your SAML SSO settings first, then activate to enable single sign-on for your organization.",
+	"settings.sso.settings.save.activate.cancel": "Cancel",
+	"settings.sso.settings.save.activate.test": "Test settings",
+	"settings.sso.settings.save.error": "Error saving SAML SSO configuration",
+	"settings.sso.settings.footer.hint": "Don't forget to activate SAML SSO once you've saved the settings.",
 	"settings.sso.actionBox.title": "Available on Enterprise plan",
 	"settings.sso.actionBox.description": "Use Single Sign On to consolidate authentication into a single platform to improve security and agility.",
 	"settings.sso.actionBox.buttonText": "See plans",
diff --git a/packages/editor-ui/src/stores/sso.store.ts b/packages/editor-ui/src/stores/sso.store.ts
index 27b21de7f5..be8b90c2f9 100644
--- a/packages/editor-ui/src/stores/sso.store.ts
+++ b/packages/editor-ui/src/stores/sso.store.ts
@@ -6,6 +6,7 @@ import { useSettingsStore } from '@/stores/settings.store';
 import * as ssoApi from '@/api/sso';
 import type { SamlPreferences } from '@/Interface';
 import { updateCurrentUser } from '@/api/users';
+import type { SamlPreferencesExtractedData } from '@/Interface';
 import { useUsersStore } from '@/stores/users.store';
 
 export const useSSOStore = defineStore('sso', () => {
@@ -15,10 +16,13 @@ export const useSSOStore = defineStore('sso', () => {
 
 	const state = reactive({
 		loading: false,
+		samlConfig: undefined as (SamlPreferences & SamlPreferencesExtractedData) | undefined,
 	});
 
 	const isLoading = computed(() => state.loading);
 
+	const samlConfig = computed(() => state.samlConfig);
+
 	const setLoading = (loading: boolean) => {
 		state.loading = loading;
 	};
@@ -56,7 +60,11 @@ export const useSSOStore = defineStore('sso', () => {
 		ssoApi.toggleSamlConfig(rootStore.getRestApiContext, { loginEnabled: enabled });
 
 	const getSamlMetadata = async () => ssoApi.getSamlMetadata(rootStore.getRestApiContext);
-	const getSamlConfig = async () => ssoApi.getSamlConfig(rootStore.getRestApiContext);
+	const getSamlConfig = async () => {
+		const samlConfig = await ssoApi.getSamlConfig(rootStore.getRestApiContext);
+		state.samlConfig = samlConfig;
+		return samlConfig;
+	};
 	const saveSamlConfig = async (config: SamlPreferences) =>
 		ssoApi.saveSamlConfig(rootStore.getRestApiContext, config);
 	const testSamlConfig = async () => ssoApi.testSamlConfig(rootStore.getRestApiContext);
@@ -77,6 +85,7 @@ export const useSSOStore = defineStore('sso', () => {
 		isEnterpriseSamlEnabled,
 		isDefaultAuthenticationSaml,
 		showSsoLoginButton,
+		samlConfig,
 		getSSORedirectUrl,
 		getSamlMetadata,
 		getSamlConfig,
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/editor-ui/src/views/SettingsSso.vue
index 0365378f2b..4e7b045bb6 100644
--- a/packages/editor-ui/src/views/SettingsSso.vue
+++ b/packages/editor-ui/src/views/SettingsSso.vue
@@ -1,55 +1,120 @@
 <script lang="ts" setup>
-import { computed, ref, onBeforeMount } from 'vue';
-import { Notification } from 'element-ui';
+import { computed, ref, onMounted } from 'vue';
 import { useSSOStore } from '@/stores/sso.store';
 import { useUIStore } from '@/stores/ui.store';
-import { i18n as locale } from '@/plugins/i18n';
 import CopyInput from '@/components/CopyInput.vue';
+import { useI18n, useMessage, useToast } from '@/composables';
 
+const IdentityProviderSettingsType = {
+	URL: 'url',
+	XML: 'xml',
+};
+
+const { i18n } = useI18n();
 const ssoStore = useSSOStore();
 const uiStore = useUIStore();
+const message = useMessage();
+const toast = useToast();
 
 const ssoActivatedLabel = computed(() =>
 	ssoStore.isSamlLoginEnabled
-		? locale.baseText('settings.sso.activated')
-		: locale.baseText('settings.sso.deactivated'),
+		? i18n.baseText('settings.sso.activated')
+		: i18n.baseText('settings.sso.deactivated'),
 );
 const ssoSettingsSaved = ref(false);
-const metadata = ref();
+
 const redirectUrl = ref();
 const entityId = ref();
 
+const ipsOptions = ref([
+	{
+		label: i18n.baseText('settings.sso.settings.ips.options.url'),
+		value: IdentityProviderSettingsType.URL,
+	},
+	{
+		label: i18n.baseText('settings.sso.settings.ips.options.xml'),
+		value: IdentityProviderSettingsType.XML,
+	},
+]);
+const ipsType = ref(IdentityProviderSettingsType.URL);
+
+const metadataUrl = ref();
+const metadata = ref();
+
+const isSaveEnabled = computed(() => {
+	if (ipsType.value === IdentityProviderSettingsType.URL) {
+		return !!metadataUrl.value && metadataUrl.value !== ssoStore.samlConfig?.metadataUrl;
+	} else if (ipsType.value === IdentityProviderSettingsType.XML) {
+		return !!metadata.value && metadata.value !== ssoStore.samlConfig?.metadata;
+	}
+	return false;
+});
+
+const isTestEnabled = computed(() => {
+	if (ipsType.value === IdentityProviderSettingsType.URL) {
+		return !!metadataUrl.value && ssoSettingsSaved.value;
+	} else if (ipsType.value === IdentityProviderSettingsType.XML) {
+		return !!metadata.value && ssoSettingsSaved.value;
+	}
+	return false;
+});
+
 const getSamlConfig = async () => {
 	const config = await ssoStore.getSamlConfig();
+
 	entityId.value = config?.entityID;
 	redirectUrl.value = config?.returnUrl;
+
+	if (config?.metadataUrl) {
+		ipsType.value = IdentityProviderSettingsType.URL;
+	} else if (config?.metadata) {
+		ipsType.value = IdentityProviderSettingsType.XML;
+	}
+
 	metadata.value = config?.metadata;
+	metadataUrl.value = config?.metadataUrl;
 	ssoSettingsSaved.value = !!config?.metadata;
 };
 
 const onSave = async () => {
 	try {
-		await ssoStore.saveSamlConfig({ metadata: metadata.value });
-		await getSamlConfig();
+		const config =
+			ipsType.value === IdentityProviderSettingsType.URL
+				? { metadataUrl: metadataUrl.value }
+				: { metadata: metadata.value };
+		await ssoStore.saveSamlConfig(config);
+
+		if (!ssoStore.isSamlLoginEnabled) {
+			const answer = await message.confirm(
+				i18n.baseText('settings.sso.settings.save.activate.message'),
+				i18n.baseText('settings.sso.settings.save.activate.title'),
+				{
+					confirmButtonText: i18n.baseText('settings.sso.settings.save.activate.test'),
+					cancelButtonText: i18n.baseText('settings.sso.settings.save.activate.cancel'),
+				},
+			);
+
+			if (answer === 'confirm') {
+				await onTest();
+			}
+		}
 	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, i18n.baseText('settings.sso.settings.save.error'));
+		return;
+	} finally {
+		await getSamlConfig();
 	}
 };
 
 const onTest = async () => {
 	try {
 		const url = await ssoStore.testSamlConfig();
-		window.open(url, '_blank');
+
+		if (typeof window !== 'undefined') {
+			window.open(url, '_blank');
+		}
 	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, 'error');
 	}
 };
 
@@ -57,31 +122,30 @@ const goToUpgrade = () => {
 	uiStore.goToUpgrade('sso', 'upgrade-sso');
 };
 
-onBeforeMount(async () => {
+onMounted(async () => {
 	if (!ssoStore.isEnterpriseSamlEnabled) {
 		return;
 	}
 	try {
 		await getSamlConfig();
 	} catch (error) {
-		Notification.error({
-			title: 'Error',
-			message: error.message,
-			position: 'bottom-right',
-		});
+		toast.showError(error, 'error');
 	}
 });
 </script>
 
 <template>
 	<div>
-		<n8n-heading size="2xlarge">{{ locale.baseText('settings.sso.title') }}</n8n-heading>
+		<n8n-heading size="2xlarge">{{ i18n.baseText('settings.sso.title') }}</n8n-heading>
 		<div :class="$style.top">
-			<n8n-heading size="medium">{{ locale.baseText('settings.sso.subtitle') }}</n8n-heading>
-			<n8n-tooltip v-if="ssoStore.isEnterpriseSamlEnabled" :disabled="ssoStore.isSamlLoginEnabled">
+			<n8n-heading size="xlarge">{{ i18n.baseText('settings.sso.subtitle') }}</n8n-heading>
+			<n8n-tooltip
+				v-if="ssoStore.isEnterpriseSamlEnabled"
+				:disabled="ssoStore.isSamlLoginEnabled || ssoSettingsSaved"
+			>
 				<template #content>
 					<span>
-						{{ locale.baseText('settings.sso.activation.tooltip') }}
+						{{ i18n.baseText('settings.sso.activation.tooltip') }}
 					</span>
 				</template>
 				<el-switch
@@ -93,62 +157,77 @@ onBeforeMount(async () => {
 			</n8n-tooltip>
 		</div>
 		<n8n-info-tip>
-			<i18n path="settings.sso.info">
-				<template #link>
-					<a href="https://docs.n8n.io/user-management/saml/" target="_blank">
-						{{ locale.baseText('settings.sso.info.link') }}
-					</a>
-				</template>
-			</i18n>
+			{{ i18n.baseText('settings.sso.info') }}
+			<a href="https://docs.n8n.io/user-management/saml/" target="_blank">
+				{{ i18n.baseText('settings.sso.info.link') }}
+			</a>
 		</n8n-info-tip>
 		<div v-if="ssoStore.isEnterpriseSamlEnabled" data-test-id="sso-content-licensed">
 			<div :class="$style.group">
-				<label>{{ locale.baseText('settings.sso.settings.redirectUrl.label') }}</label>
+				<label>{{ i18n.baseText('settings.sso.settings.redirectUrl.label') }}</label>
 				<CopyInput
 					:value="redirectUrl"
-					:copy-button-text="locale.baseText('generic.clickToCopy')"
-					:toast-title="locale.baseText('settings.sso.settings.redirectUrl.copied')"
+					:copy-button-text="i18n.baseText('generic.clickToCopy')"
+					:toast-title="i18n.baseText('settings.sso.settings.redirectUrl.copied')"
 				/>
-				<small>{{ locale.baseText('settings.sso.settings.redirectUrl.help') }}</small>
+				<small>{{ i18n.baseText('settings.sso.settings.redirectUrl.help') }}</small>
 			</div>
 			<div :class="$style.group">
-				<label>{{ locale.baseText('settings.sso.settings.entityId.label') }}</label>
+				<label>{{ i18n.baseText('settings.sso.settings.entityId.label') }}</label>
 				<CopyInput
 					:value="entityId"
-					:copy-button-text="locale.baseText('generic.clickToCopy')"
-					:toast-title="locale.baseText('settings.sso.settings.entityId.copied')"
+					:copy-button-text="i18n.baseText('generic.clickToCopy')"
+					:toast-title="i18n.baseText('settings.sso.settings.entityId.copied')"
 				/>
-				<small>{{ locale.baseText('settings.sso.settings.entityId.help') }}</small>
+				<small>{{ i18n.baseText('settings.sso.settings.entityId.help') }}</small>
 			</div>
 			<div :class="$style.group">
-				<label>{{ locale.baseText('settings.sso.settings.ips.label') }}</label>
-				<n8n-input v-model="metadata" type="textarea" name="metadata" />
-				<small>{{ locale.baseText('settings.sso.settings.ips.help') }}</small>
+				<label>{{ i18n.baseText('settings.sso.settings.ips.label') }}</label>
+				<div class="mt-2xs mb-s">
+					<n8n-radio-buttons :options="ipsOptions" v-model="ipsType" />
+				</div>
+				<div v-show="ipsType === IdentityProviderSettingsType.URL">
+					<n8n-input
+						v-model="metadataUrl"
+						type="text"
+						name="metadataUrl"
+						size="large"
+						:placeholder="i18n.baseText('settings.sso.settings.ips.url.placeholder')"
+					/>
+					<small>{{ i18n.baseText('settings.sso.settings.ips.url.help') }}</small>
+				</div>
+				<div v-show="ipsType === IdentityProviderSettingsType.XML">
+					<n8n-input v-model="metadata" type="textarea" name="metadata" :rows="4" />
+					<small>{{ i18n.baseText('settings.sso.settings.ips.xml.help') }}</small>
+				</div>
 			</div>
 			<div :class="$style.buttons">
+				<n8n-button :disabled="!isSaveEnabled" @click="onSave" data-test-id="sso-save">
+					{{ i18n.baseText('settings.sso.settings.save') }}
+				</n8n-button>
 				<n8n-button
-					:disabled="!ssoSettingsSaved"
+					:disabled="!isTestEnabled"
 					type="tertiary"
 					@click="onTest"
 					data-test-id="sso-test"
 				>
-					{{ locale.baseText('settings.sso.settings.test') }}
-				</n8n-button>
-				<n8n-button :disabled="!metadata" @click="onSave" data-test-id="sso-save">
-					{{ locale.baseText('settings.sso.settings.save') }}
+					{{ i18n.baseText('settings.sso.settings.test') }}
 				</n8n-button>
 			</div>
+			<footer :class="$style.footer">
+				{{ i18n.baseText('settings.sso.settings.footer.hint') }}
+			</footer>
 		</div>
 		<n8n-action-box
 			v-else
 			data-test-id="sso-content-unlicensed"
 			:class="$style.actionBox"
-			:description="locale.baseText('settings.sso.actionBox.description')"
-			:buttonText="locale.baseText('settings.sso.actionBox.buttonText')"
+			:description="i18n.baseText('settings.sso.actionBox.description')"
+			:buttonText="i18n.baseText('settings.sso.actionBox.buttonText')"
 			@click="goToUpgrade"
 		>
 			<template #heading>
-				<span>{{ locale.baseText('settings.sso.actionBox.title') }}</span>
+				<span>{{ i18n.baseText('settings.sso.actionBox.title') }}</span>
 			</template>
 		</n8n-action-box>
 	</div>
@@ -173,7 +252,7 @@ onBeforeMount(async () => {
 .buttons {
 	display: flex;
 	justify-content: flex-start;
-	padding: var(--spacing-2xl) 0 var(--spacing-3xl);
+	padding: var(--spacing-2xl) 0 var(--spacing-2xs);
 
 	button {
 		margin: 0 var(--spacing-s) 0 0;
@@ -183,7 +262,7 @@ onBeforeMount(async () => {
 .group {
 	padding: var(--spacing-xl) 0 0;
 
-	label {
+	> label {
 		display: inline-block;
 		font-size: var(--font-size-s);
 		font-weight: var(--font-weight-bold);
@@ -201,4 +280,9 @@ onBeforeMount(async () => {
 .actionBox {
 	margin: var(--spacing-2xl) 0 0;
 }
+
+.footer {
+	color: var(--color-text-base);
+	font-size: var(--font-size-2xs);
+}
 </style>
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
index 78ea5a6f53..36fb4bb386 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
@@ -1,58 +1,46 @@
-import { PiniaVuePlugin } from 'pinia';
-import { render } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
-import { faker } from '@faker-js/faker';
+import { createPinia, setActivePinia } from 'pinia';
 import SettingsSso from '@/views/SettingsSso.vue';
+
+import { renderComponent, retry } from '@/__tests__/utils';
+import { setupServer } from '@/__tests__/server';
+import { afterAll, beforeAll } from 'vitest';
+import { useSettingsStore } from '@/stores';
+import userEvent from '@testing-library/user-event';
 import { useSSOStore } from '@/stores/sso.store';
-import { STORES } from '@/constants';
-import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils';
 import { i18nInstance } from '@/plugins/i18n';
-import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
 
-let pinia: ReturnType<typeof createTestingPinia>;
+let pinia: ReturnType<typeof createPinia>;
 let ssoStore: ReturnType<typeof useSSOStore>;
-
-const samlConfig: SamlPreferences & SamlPreferencesExtractedData = {
-	metadata: '<?xml version="1.0"?>',
-	entityID: faker.internet.url(),
-	returnUrl: faker.internet.url(),
-};
-
-const renderComponent = (renderOptions: Parameters<typeof render>[1] = {}) =>
-	render(
-		SettingsSso,
-		merge(
-			{
-				pinia,
-				i18n: i18nInstance,
-			},
-			renderOptions,
-		),
-		(vue) => {
-			vue.use(PiniaVuePlugin);
-		},
-	);
+let server: ReturnType<typeof setupServer>;
 
 describe('SettingsSso', () => {
-	beforeEach(() => {
-		pinia = createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
-				},
-			},
-		});
-		ssoStore = useSSOStore(pinia);
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		window.open = vi.fn();
+
+		await useSettingsStore().getSettings();
+		ssoStore = useSSOStore();
 	});
 
 	afterEach(() => {
 		vi.clearAllMocks();
 	});
 
+	afterAll(() => {
+		server.shutdown();
+	});
+
 	it('should render paywall state when there is no license', () => {
-		const { getByTestId, queryByTestId, queryByRole } = renderComponent();
+		const { getByTestId, queryByTestId, queryByRole } = renderComponent(SettingsSso, {
+			pinia,
+			i18n: i18nInstance,
+		});
 
 		expect(queryByRole('checkbox')).not.toBeInTheDocument();
 		expect(queryByTestId('sso-content-licensed')).not.toBeInTheDocument();
@@ -62,7 +50,10 @@ describe('SettingsSso', () => {
 	it('should render licensed content', () => {
 		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
 
-		const { getByTestId, queryByTestId, getByRole } = renderComponent();
+		const { getByTestId, queryByTestId, getByRole } = renderComponent(SettingsSso, {
+			pinia,
+			i18n: i18nInstance,
+		});
 
 		expect(getByRole('checkbox')).toBeInTheDocument();
 		expect(getByTestId('sso-content-licensed')).toBeInTheDocument();
@@ -71,19 +62,34 @@ describe('SettingsSso', () => {
 
 	it('should enable activation checkbox and test button if data is already saved', async () => {
 		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
-		vi.spyOn(ssoStore, 'getSamlConfig').mockResolvedValue(samlConfig);
 
-		const { getByRole, getByTestId } = renderComponent();
-		await waitAllPromises();
+		const { container, getByTestId, getByRole } = renderComponent(SettingsSso, {
+			pinia,
+			i18n: i18nInstance,
+		});
+
+		await retry(() =>
+			expect(container.querySelector('textarea[name="metadata"]')).toHaveValue(
+				'<?xml version="1.0"?>',
+			),
+		);
 
 		expect(getByRole('checkbox')).toBeEnabled();
 		expect(getByTestId('sso-test')).toBeEnabled();
 	});
 
 	it('should enable activation checkbox after data is saved', async () => {
+		await ssoStore.saveSamlConfig({ metadata: '' });
+
 		vi.spyOn(ssoStore, 'isEnterpriseSamlEnabled', 'get').mockReturnValue(true);
 
-		const { getByRole, getAllByRole, getByTestId } = renderComponent();
+		const saveSpy = vi.spyOn(ssoStore, 'saveSamlConfig');
+		const getSpy = vi.spyOn(ssoStore, 'getSamlConfig');
+
+		const { container, getByRole, getByTestId } = renderComponent(SettingsSso, {
+			pinia,
+			i18n: i18nInstance,
+		});
 		const checkbox = getByRole('checkbox');
 		const btnSave = getByTestId('sso-save');
 		const btnTest = getByTestId('sso-test');
@@ -93,8 +99,12 @@ describe('SettingsSso', () => {
 			expect(el).toBeDisabled();
 		});
 
+		const xmlRadioButton = getByTestId('radio-button-xml');
+		await userEvent.click(xmlRadioButton);
+
+		await retry(() => expect(container.querySelector('textarea[name="metadata"]')).toBeVisible());
 		await userEvent.type(
-			getAllByRole('textbox').find((el) => el.getAttribute('name') === 'metadata')!,
+			container.querySelector('textarea[name="metadata"]')!,
 			'<?xml version="1.0"?>',
 		);
 
@@ -102,14 +112,9 @@ describe('SettingsSso', () => {
 		expect(btnTest).toBeDisabled();
 		expect(btnSave).toBeEnabled();
 
-		const saveSpy = vi.spyOn(ssoStore, 'saveSamlConfig');
-		const getSpy = vi.spyOn(ssoStore, 'getSamlConfig').mockResolvedValue(samlConfig);
 		await userEvent.click(btnSave);
 
 		expect(saveSpy).toHaveBeenCalled();
 		expect(getSpy).toHaveBeenCalled();
-		expect(checkbox).toBeEnabled();
-		expect(btnTest).toBeEnabled();
-		expect(btnSave).toBeEnabled();
 	});
 });