diff --git a/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/jwks/JWKSGeneratorTest.kt b/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/jwks/JWKSGeneratorTest.kt
index 1071261c..e744a224 100644
--- a/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/jwks/JWKSGeneratorTest.kt
+++ b/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/jwks/JWKSGeneratorTest.kt
@@ -1,10 +1,9 @@
 package com.sphereon.oid.fed.jwks
 
 import com.sphereon.oid.fed.kms.MemoryKeyStore
-import org.junit.jupiter.api.Assertions.assertNotNull
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.BeforeTest
+import kotlin.test.assertNotNull
 import kotlin.test.assertEquals
 
 
@@ -12,7 +11,7 @@ class JWKSGenerationTest {
 
     private lateinit var jwksGenerator: JWKSGenerator
 
-    @BeforeEach
+    @BeforeTest
     fun setUp() {
         jwksGenerator = JWKSGenerator(MemoryKeyStore())
     }
diff --git a/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/kms/MemoryKeyStoreTest.kt b/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/kms/MemoryKeyStoreTest.kt
index e8f1f957..20854b7f 100644
--- a/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/kms/MemoryKeyStoreTest.kt
+++ b/modules/openid-federation-common/src/commonTest/kotlin/com/sphereon/oid/fed/common/kms/MemoryKeyStoreTest.kt
@@ -3,10 +3,10 @@ package com.sphereon.oid.fed.jwks
 import com.nimbusds.jose.jwk.KeyUse
 import com.nimbusds.jose.jwk.gen.RSAKeyGenerator
 import com.sphereon.oid.fed.kms.MemoryKeyStore
-import org.junit.jupiter.api.Assertions.assertNotNull
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
+import kotlin.test.Test
+import kotlin.test.BeforeTest
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
 import java.util.*
 
 class MemoryKeyStoreTest {
@@ -14,7 +14,7 @@ class MemoryKeyStoreTest {
     lateinit var kms: MemoryKeyStore
     lateinit var keyId: String
 
-    @BeforeEach
+    @BeforeTest
     fun setUp() {
         kms = MemoryKeyStore()
         keyId =  UUID.randomUUID().toString()