diff --git a/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts b/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts
index c4a33ed441..1cd57c4bcc 100644
--- a/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts
+++ b/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts
@@ -44,7 +44,7 @@ describe('Test views', () => {
 
 		await controller.acsPost(req, res);
 
-		expect(res.render).toBeCalledWith('saml-connection-test-success', attributes);
+		expect(res.render).toBeCalledWith('sso/saml-connection-test-success', attributes);
 	});
 
 	test('Should render failure with template', async () => {
@@ -60,7 +60,10 @@ describe('Test views', () => {
 
 		await controller.acsPost(req, res);
 
-		expect(res.render).toBeCalledWith('saml-connection-test-failed', { message: '', attributes });
+		expect(res.render).toBeCalledWith('sso/saml-connection-test-failed', {
+			message: '',
+			attributes,
+		});
 	});
 
 	test('Should render error with template', async () => {
@@ -72,6 +75,6 @@ describe('Test views', () => {
 
 		await controller.acsPost(req, res);
 
-		expect(res.render).toBeCalledWith('saml-connection-test-failed', { message: 'Test Error' });
+		expect(res.render).toBeCalledWith('sso/saml-connection-test-failed', { message: 'Test Error' });
 	});
 });
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
index c7b954914b..e7c73200b6 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -119,9 +119,9 @@ export class SamlController {
 			// if RelayState is set to the test connection Url, this is a test connection
 			if (isConnectionTestRequest(req)) {
 				if (loginResult.authenticatedUser) {
-					return res.render('saml-connection-test-success', loginResult.attributes);
+					return res.render('sso/saml-connection-test-success', loginResult.attributes);
 				} else {
-					return res.render('saml-connection-test-failed', {
+					return res.render('sso/saml-connection-test-failed', {
 						message: '',
 						attributes: loginResult.attributes,
 					});
@@ -154,7 +154,7 @@ export class SamlController {
 			return sendErrorResponse(res, new AuthError('SAML Authentication failed'));
 		} catch (error) {
 			if (isConnectionTestRequest(req)) {
-				return res.render('saml-connection-test-failed', { message: (error as Error).message });
+				return res.render('sso/saml-connection-test-failed', { message: (error as Error).message });
 			}
 			this.eventService.emit('user-login-failed', {
 				userEmail: 'unknown',
diff --git a/packages/cli/templates/saml-connection-test-failed.handlebars b/packages/cli/templates/sso/saml-connection-test-failed.handlebars
similarity index 100%
rename from packages/cli/templates/saml-connection-test-failed.handlebars
rename to packages/cli/templates/sso/saml-connection-test-failed.handlebars
diff --git a/packages/cli/templates/saml-connection-test-success.handlebars b/packages/cli/templates/sso/saml-connection-test-success.handlebars
similarity index 100%
rename from packages/cli/templates/saml-connection-test-success.handlebars
rename to packages/cli/templates/sso/saml-connection-test-success.handlebars