diff --git a/build.sbt b/build.sbt
index 38a9a2a404..ddf3a5750c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -731,10 +731,18 @@ lazy val polluxCore = project
     name := "pollux-core",
     libraryDependencies ++= D_Pollux.coreDependencies
   )
-  .dependsOn(shared)
-  .dependsOn(agentWalletAPI)
-  .dependsOn(polluxVcJWT)
-  .dependsOn(vc, resolver, agentDidcommx, eventNotification, polluxAnoncreds, polluxSDJWT)
+  .dependsOn(
+    shared,
+    castorCore % "compile->compile;test->test", // Test is for MockDIDService
+    agentWalletAPI % "compile->compile;test->test", // Test is for MockManagedDIDService
+    vc,
+    resolver,
+    agentDidcommx,
+    eventNotification,
+    polluxAnoncreds,
+    polluxVcJWT,
+    polluxSDJWT,
+  )
 
 lazy val polluxDoobie = project
   .in(file("pollux/sql-doobie"))
@@ -864,17 +872,16 @@ lazy val cloudAgentServer = project
   .enablePlugins(BuildInfoPlugin)
   .dependsOn(agentWalletAPI % "compile->compile;test->test")
   .dependsOn(
+    sharedTest % "test->test",
     agent,
-    polluxCore,
+    polluxCore % "compile->compile;test->test",
     polluxDoobie,
     polluxAnoncreds,
-    connectCore,
+    connectCore % "compile->compile;test->test", // Test is for MockConnectionService
     connectDoobie,
     castorCore,
-    eventNotification
+    eventNotification,
   )
-  .dependsOn(sharedTest % "test->test")
-  .dependsOn(polluxCore % "compile->compile;test->test")
 
 // ############################
 // ####  Release process  #####
diff --git a/castor/src/main/scala/org/hyperledger/identus/castor/core/service/MockDIDService.scala b/castor/src/test/scala/org/hyperledger/identus/castor/core/service/MockDIDService.scala
similarity index 100%
rename from castor/src/main/scala/org/hyperledger/identus/castor/core/service/MockDIDService.scala
rename to castor/src/test/scala/org/hyperledger/identus/castor/core/service/MockDIDService.scala
diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/MockManagedDIDService.scala b/cloud-agent/service/wallet-api/src/test/scala/org/hyperledger/identus/agent/walletapi/service/MockManagedDIDService.scala
similarity index 100%
rename from cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/service/MockManagedDIDService.scala
rename to cloud-agent/service/wallet-api/src/test/scala/org/hyperledger/identus/agent/walletapi/service/MockManagedDIDService.scala
diff --git a/cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/storage/MockDIDNonSecretStorage.scala b/cloud-agent/service/wallet-api/src/test/scala/org/hyperledger/identus/agent/walletapi/storage/MockDIDNonSecretStorage.scala
similarity index 100%
rename from cloud-agent/service/wallet-api/src/main/scala/org/hyperledger/identus/agent/walletapi/storage/MockDIDNonSecretStorage.scala
rename to cloud-agent/service/wallet-api/src/test/scala/org/hyperledger/identus/agent/walletapi/storage/MockDIDNonSecretStorage.scala
diff --git a/connect/core/src/main/scala/org/hyperledger/identus/connect/core/service/MockConnectionService.scala b/connect/core/src/test/scala/org/hyperledger/identus/connect/core/service/MockConnectionService.scala
similarity index 100%
rename from connect/core/src/main/scala/org/hyperledger/identus/connect/core/service/MockConnectionService.scala
rename to connect/core/src/test/scala/org/hyperledger/identus/connect/core/service/MockConnectionService.scala
diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala b/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala
similarity index 100%
rename from pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala
rename to pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala
diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/MockOID4VCIIssuerMetadataService.scala b/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/MockOID4VCIIssuerMetadataService.scala
similarity index 100%
rename from pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/MockOID4VCIIssuerMetadataService.scala
rename to pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/MockOID4VCIIssuerMetadataService.scala
diff --git a/pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/MockPresentationService.scala b/pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/MockPresentationService.scala
similarity index 100%
rename from pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/service/MockPresentationService.scala
rename to pollux/core/src/test/scala/org/hyperledger/identus/pollux/core/service/MockPresentationService.scala