diff --git a/extensions/common/azure/azure-test/build.gradle.kts b/extensions/common/azure/azure-test/build.gradle.kts
index 6baa1b0b..2d3f5703 100644
--- a/extensions/common/azure/azure-test/build.gradle.kts
+++ b/extensions/common/azure/azure-test/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     testFixturesApi(libs.testcontainers.junit)
     testFixturesApi(libs.edc.lib.util)
     testFixturesApi(libs.edc.junit)
-    testFixturesApi(libs.edc.sql.core)
+    testFixturesApi(libs.edc.sql.lib)
     testFixturesApi(libs.azure.storageblob)
     testFixturesApi(libs.junit.jupiter.api)
 }
diff --git a/extensions/control-plane/store/asset-index-cosmos/build.gradle.kts b/extensions/control-plane/store/asset-index-cosmos/build.gradle.kts
index 8a775a6f..c9d936e9 100644
--- a/extensions/control-plane/store/asset-index-cosmos/build.gradle.kts
+++ b/extensions/control-plane/store/asset-index-cosmos/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
 
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
     testImplementation(testFixtures(libs.edc.spi.asset))
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.assetindex)
 
 }
diff --git a/extensions/control-plane/store/contract-definition-store-cosmos/build.gradle.kts b/extensions/control-plane/store/contract-definition-store-cosmos/build.gradle.kts
index 70aea9ff..8015cdf2 100644
--- a/extensions/control-plane/store/contract-definition-store-cosmos/build.gradle.kts
+++ b/extensions/control-plane/store/contract-definition-store-cosmos/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 
     implementation(libs.failsafe.core)
 
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.contractdefinition)
     testImplementation(testFixtures(libs.edc.spi.contract))
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
diff --git a/extensions/control-plane/store/contract-negotiation-store-cosmos/build.gradle.kts b/extensions/control-plane/store/contract-negotiation-store-cosmos/build.gradle.kts
index a91c684f..d4fd7014 100644
--- a/extensions/control-plane/store/contract-negotiation-store-cosmos/build.gradle.kts
+++ b/extensions/control-plane/store/contract-negotiation-store-cosmos/build.gradle.kts
@@ -25,9 +25,8 @@ dependencies {
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
     testImplementation(libs.awaitility)
 
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.contractnegotiation)
-    testImplementation(testFixtures(libs.edc.sql.lease))
     testImplementation(testFixtures(libs.edc.spi.contract))
 
 }
diff --git a/extensions/control-plane/store/policy-definition-store-cosmos/build.gradle.kts b/extensions/control-plane/store/policy-definition-store-cosmos/build.gradle.kts
index 97b25527..68857668 100644
--- a/extensions/control-plane/store/policy-definition-store-cosmos/build.gradle.kts
+++ b/extensions/control-plane/store/policy-definition-store-cosmos/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 
     implementation(libs.failsafe.core)
 
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.policydefinition)
     testImplementation(libs.edc.junit)
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
diff --git a/extensions/control-plane/store/transfer-process-store-cosmos/build.gradle.kts b/extensions/control-plane/store/transfer-process-store-cosmos/build.gradle.kts
index 803b2486..f5574f35 100644
--- a/extensions/control-plane/store/transfer-process-store-cosmos/build.gradle.kts
+++ b/extensions/control-plane/store/transfer-process-store-cosmos/build.gradle.kts
@@ -23,11 +23,10 @@ dependencies {
     implementation(libs.failsafe.core)
 
 
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.transferprocess)
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
     testImplementation(libs.awaitility)
-    testImplementation(testFixtures(libs.edc.sql.lease))
     testImplementation(testFixtures(libs.edc.spi.transfer))
 }
 
diff --git a/extensions/data-plane-selector/data-plane-instance-store-cosmos/build.gradle.kts b/extensions/data-plane-selector/data-plane-instance-store-cosmos/build.gradle.kts
index f78bfc00..18cb5b43 100644
--- a/extensions/data-plane-selector/data-plane-instance-store-cosmos/build.gradle.kts
+++ b/extensions/data-plane-selector/data-plane-instance-store-cosmos/build.gradle.kts
@@ -8,11 +8,10 @@ dependencies {
 
     implementation(libs.failsafe.core)
 
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.dataplane.instancestore)
     testImplementation(libs.edc.junit)
-    testImplementation(testFixtures(libs.edc.sql.lease))
-    testImplementation(testFixtures(libs.edc.sql.core))
+    testImplementation(testFixtures(libs.edc.sql.test.fixtures))
     testImplementation(testFixtures(libs.edc.dpf.selector.spi))
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
 }
diff --git a/extensions/data-plane-selector/data-plane-instance-store-cosmos/src/test/java/org/eclipse/edc/connector/dataplane/selector/store/cosmos/CosmosDataPlaneInstanceStoreTest.java b/extensions/data-plane-selector/data-plane-instance-store-cosmos/src/test/java/org/eclipse/edc/connector/dataplane/selector/store/cosmos/CosmosDataPlaneInstanceStoreTest.java
index b729c67e..10fcc9cf 100644
--- a/extensions/data-plane-selector/data-plane-instance-store-cosmos/src/test/java/org/eclipse/edc/connector/dataplane/selector/store/cosmos/CosmosDataPlaneInstanceStoreTest.java
+++ b/extensions/data-plane-selector/data-plane-instance-store-cosmos/src/test/java/org/eclipse/edc/connector/dataplane/selector/store/cosmos/CosmosDataPlaneInstanceStoreTest.java
@@ -25,7 +25,7 @@
 import org.eclipse.edc.json.JacksonTypeManager;
 import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
 import org.eclipse.edc.sql.QueryExecutor;
-import org.eclipse.edc.sql.lease.testfixtures.LeaseUtil;
+import org.eclipse.edc.sql.testfixtures.LeaseUtil;
 import org.eclipse.edc.transaction.datasource.spi.DataSourceRegistry;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.junit.jupiter.api.AfterAll;
diff --git a/extensions/data-plane/store/data-plane-store-cosmos/build.gradle.kts b/extensions/data-plane/store/data-plane-store-cosmos/build.gradle.kts
index e7d132e1..dd1750c0 100644
--- a/extensions/data-plane/store/data-plane-store-cosmos/build.gradle.kts
+++ b/extensions/data-plane/store/data-plane-store-cosmos/build.gradle.kts
@@ -9,12 +9,11 @@ dependencies {
 
     implementation(libs.failsafe.core)
 
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.dataplane.store)
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
     testImplementation(testFixtures(libs.edc.spi.dataplane))
     testImplementation(testFixtures(libs.edc.dpf.selector.spi))
-    testImplementation(testFixtures(libs.edc.sql.lease))
     testImplementation(libs.awaitility)
 
 }
diff --git a/extensions/identity-hub/identity-hub-store-cosmos/build.gradle.kts b/extensions/identity-hub/identity-hub-store-cosmos/build.gradle.kts
index 29cd6b9d..f353bb26 100644
--- a/extensions/identity-hub/identity-hub-store-cosmos/build.gradle.kts
+++ b/extensions/identity-hub/identity-hub-store-cosmos/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
 
     testImplementation(testFixtures(project(":extensions:common:azure:azure-test")))
     testImplementation(project(":extensions:common:azure:azure-test"))
-    testImplementation(libs.edc.sql.core)
+    testImplementation(libs.edc.sql.lib)
     testImplementation(libs.edc.sql.identityhub.store)
     testImplementation(testFixtures(libs.edc.ih.spi.store))
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9433d003..c6c830f1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -59,13 +59,13 @@ edc-management-api-test-fixtures = { module = "org.eclipse.edc:management-api-te
 edc-lib-util = { module = "org.eclipse.edc:util-lib", version.ref = "edc" }
 
 # EDC dependencies for testing
-edc-sql-core = { module = "org.eclipse.edc:sql-core", version.ref = "edc" }
+edc-sql-lib = { module = "org.eclipse.edc:sql-lib", version.ref = "edc" }
+edc-sql-test-fixtures = { module = "org.eclipse.edc:sql-test-fixtures", version.ref = "edc" }
 edc-sql-assetindex = { module = "org.eclipse.edc:asset-index-sql", version.ref = "edc" }
 edc-sql-contractdefinition = { module = "org.eclipse.edc:contract-definition-store-sql", version.ref = "edc" }
 edc-sql-contractnegotiation = { module = "org.eclipse.edc:contract-negotiation-store-sql", version.ref = "edc" }
 edc-sql-policydefinition = { module = "org.eclipse.edc:policy-definition-store-sql", version.ref = "edc" }
 edc-sql-transferprocess = { module = "org.eclipse.edc:transfer-process-store-sql", version.ref = "edc" }
-edc-sql-lease = { module = "org.eclipse.edc:sql-lease", version.ref = "edc" }
 edc-sql-dataplane-instancestore = { module = "org.eclipse.edc:data-plane-instance-store-sql", version.ref = "edc" }
 edc-sql-dataplane-store = { module = "org.eclipse.edc:data-plane-store-sql", version.ref = "edc" }
 edc-sql-identityhub-store = { module = "org.eclipse.edc:identity-hub-store-sql", version.ref = "identityhub" }