diff --git a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/CI_JVM_Test.kt b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/CI_JVM_Test.kt
index 4d80db773..0fc5d230c 100644
--- a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/CI_JVM_Test.kt
+++ b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/CI_JVM_Test.kt
@@ -103,7 +103,7 @@ class CI_JVM_Test : AnnotationSpec() {
 
     @BeforeAll
     fun init() {
-        ServiceMatrix("service-matrix.properties")
+        ServiceMatrix("test-config/service-matrix.properties")
         ciTestProvider = CITestProvider()
         credentialWallet = TestCredentialWallet(CredentialWalletConfig("http://blank"))
         ciTestProvider.start()
diff --git a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/EBSI_Conformance_Test.kt b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/EBSI_Conformance_Test.kt
index 7a51d8648..35f3dffe0 100644
--- a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/EBSI_Conformance_Test.kt
+++ b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/EBSI_Conformance_Test.kt
@@ -29,7 +29,7 @@ class EBSI_Conformance_Test: AnnotationSpec() {
 
   @BeforeAll
   fun init() {
-    ServiceMatrix("service-matrix.properties")
+    ServiceMatrix("test-config/service-matrix.properties")
     credentialWallet = EBSITestWallet(CredentialWalletConfig("https://blank/"))
   }
 
diff --git a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/VP_JVM_Test.kt b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/VP_JVM_Test.kt
index 58c694170..6f2d0a9c2 100644
--- a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/VP_JVM_Test.kt
+++ b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/VP_JVM_Test.kt
@@ -50,7 +50,7 @@ class VP_JVM_Test : AnnotationSpec() {
 
     @BeforeAll
     fun init() {
-        ServiceMatrix("service-matrix.properties")
+        ServiceMatrix("test-config/service-matrix.properties")
         testWallet = TestCredentialWallet(CredentialWalletConfig(WALLET_BASE_URL))
         testWallet.start()
 
diff --git a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/wallettest.kt b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/wallettest.kt
index 64b0eed47..267fe7e1b 100644
--- a/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/wallettest.kt
+++ b/waltid-openid4vc/src/jvmTest/kotlin/id/walt/oid4vc/wallettest.kt
@@ -56,7 +56,7 @@ class wallettest : AnnotationSpec() {
 
     //@BeforeAll   /* Uncomment me */
     fun init() {
-        ServiceMatrix("service-matrix.properties")
+        ServiceMatrix("test-config/service-matrix.properties")
         ciTestProvider = CITestProvider()
         credentialWallet = TestCredentialWallet(CredentialWalletConfig("http://blank"))
         //ciTestProvider.start()
diff --git a/waltid-openid4vc/test-config/service-matrix.properties b/waltid-openid4vc/test-config/service-matrix.properties
new file mode 100644
index 000000000..133db1165
--- /dev/null
+++ b/waltid-openid4vc/test-config/service-matrix.properties
@@ -0,0 +1,12 @@
+id.walt.services.ecosystems.essif.didebsi.DidEbsiService=id.walt.services.ecosystems.essif.didebsi.WaltIdDidEbsiService
+id.walt.services.ecosystems.essif.jsonrpc.JsonRpcService=id.walt.services.ecosystems.essif.jsonrpc.WaltIdJsonRpcService
+id.walt.services.vc.JsonLdCredentialService=id.walt.services.vc.WaltIdJsonLdCredentialService
+id.walt.services.vc.JwtCredentialService=id.walt.services.vc.WaltIdJwtCredentialService
+id.walt.services.crypto.CryptoService=id.walt.services.crypto.SunCryptoService
+id.walt.services.keystore.KeyStoreService=id.walt.services.keystore.SqlKeyStoreService
+id.walt.services.key.KeyService=id.walt.services.key.WaltIdKeyService
+id.walt.services.jwt.JwtService=id.walt.services.jwt.WaltIdJwtService
+id.walt.services.vcstore.VcStoreService=id.walt.services.vcstore.FileSystemVcStoreService
+id.walt.services.context.ContextManager=id.walt.services.context.WaltIdContextManager
+id.walt.custodian.Custodian=id.walt.custodian.WaltIdCustodian
+id.walt.signatory.Signatory=id.walt.signatory.WaltIdSignatory:test-config/signatory.conf
diff --git a/waltid-openid4vc/test-config/signatory.conf b/waltid-openid4vc/test-config/signatory.conf
new file mode 100644
index 000000000..ef0508af0
--- /dev/null
+++ b/waltid-openid4vc/test-config/signatory.conf
@@ -0,0 +1,9 @@
+proofConfig {
+  issuerDid="todo"
+  issuerVerificationMethod="todo"
+  proofType="LD_PROOF"
+  domain="todo"
+  nonce="todo"
+  credentialsEndpoint="http://127.0.0.1:7001/v1/credentials"
+}
+templatesFolder: "vc-templates-runtime"