diff --git a/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.integration.spec.ts b/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.integration.spec.ts
index 7bfcadb2058..bae96a2d119 100644
--- a/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.integration.spec.ts
+++ b/apps/server/src/infra/identity-management/keycloak-configuration/service/keycloak-configuration.service.integration.spec.ts
@@ -3,10 +3,10 @@ import { MongoMemoryDatabaseModule } from '@infra/database';
 import KeycloakAdminClient from '@keycloak/keycloak-admin-client-cjs/keycloak-admin-client-cjs-index';
 import AuthenticationExecutionExportRepresentation from '@keycloak/keycloak-admin-client/lib/defs/authenticationExecutionExportRepresentation';
 import AuthenticationFlowRepresentation from '@keycloak/keycloak-admin-client/lib/defs/authenticationFlowRepresentation';
-import { LegacySystemService } from '@modules/system/service/legacy-system.service';
+import { LegacySystemService } from '@modules/system';
 import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { LegacySystemRepo } from '@shared/repo/system/system.repo';
+import { LegacySystemRepo } from '@shared/repo';
 import { systemEntityFactory } from '@shared/testing/factory';
 import { LoggerModule } from '@src/core/logger';
 import { v1 } from 'uuid';
diff --git a/apps/server/src/modules/system/controller/api-test/system.api.spec.ts b/apps/server/src/modules/system/controller/api-test/system.api.spec.ts
index 3019c6dde0d..a449db0ffc9 100644
--- a/apps/server/src/modules/system/controller/api-test/system.api.spec.ts
+++ b/apps/server/src/modules/system/controller/api-test/system.api.spec.ts
@@ -45,7 +45,7 @@ describe('System (API)', () => {
 			it('should return a list of all systems', async () => {
 				const { system1, system2, system2OauthConfig } = await setup();
 
-				const response: Response = await testApiClient.get(`/systems/public`).expect(200);
+				const response: Response = await testApiClient.get(`/public`).expect(200);
 
 				expect(response.body).toEqual<PublicSystemListResponse>({
 					data: [
@@ -96,7 +96,7 @@ describe('System (API)', () => {
 			it('should return the system', async () => {
 				const { system1 } = await setup();
 
-				const response: Response = await testApiClient.get(`/systems/public/${system1.id}`).expect(200);
+				const response: Response = await testApiClient.get(`/public/${system1.id}`).expect(200);
 
 				expect(response.body).toEqual<PublicSystemResponse>({
 					id: system1.id,