diff --git a/DEPENDENCIES b/DEPENDENCIES
index 317a680dd..a956dd3d4 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -277,7 +277,6 @@ maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.1, Apache-2.0, approved,
 maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.14.15, Apache-2.0, approved, #7164
 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.1, Apache-2.0 AND BSD-3-Clause, approved, #7163
 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.15, Apache-2.0 AND BSD-3-Clause, approved, #7163
-maven/mavencentral/net.bytebuddy/byte-buddy/1.14.16, Apache-2.0 AND BSD-3-Clause, approved, #7163
 maven/mavencentral/net.bytebuddy/byte-buddy/1.14.18, Apache-2.0 AND BSD-3-Clause, approved, #7163
 maven/mavencentral/net.java.dev.jna/jna-platform/5.13.0, Apache-2.0 OR LGPL-2.1-or-later, approved, #6707
 maven/mavencentral/net.java.dev.jna/jna-platform/5.6.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ22390
diff --git a/edc-extensions/dataplane/dataplane-selector-configuration/build.gradle.kts b/edc-extensions/dataplane/dataplane-selector-configuration/build.gradle.kts
index 185d46b59..476961466 100644
--- a/edc-extensions/dataplane/dataplane-selector-configuration/build.gradle.kts
+++ b/edc-extensions/dataplane/dataplane-selector-configuration/build.gradle.kts
@@ -24,8 +24,8 @@ plugins {
 
 dependencies {
     api(libs.edc.spi.core)
-    api(libs.edc.junit)
     implementation(libs.edc.spi.dataplane.selector)
     implementation(libs.edc.spi.dataplane.transfer)
     implementation(libs.bouncyCastle.bcpkixJdk18on)
+    testImplementation(libs.edc.junit)
 }
diff --git a/edc-extensions/migrations/control-plane-migration/build.gradle.kts b/edc-extensions/migrations/control-plane-migration/build.gradle.kts
index 2ff1aa7fa..fbb1187b2 100644
--- a/edc-extensions/migrations/control-plane-migration/build.gradle.kts
+++ b/edc-extensions/migrations/control-plane-migration/build.gradle.kts
@@ -25,7 +25,6 @@ plugins {
 dependencies {
     implementation(project(":edc-extensions:migrations:postgresql-migration-lib"))
     implementation(libs.edc.spi.core)
-    implementation(libs.edc.junit)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.sql.assetindex)
     implementation(libs.edc.sql.core)
@@ -37,5 +36,6 @@ dependencies {
     // https://documentation.red-gate.com/flyway/release-notes-and-older-versions/release-notes-for-flyway-engine
     runtimeOnly(libs.flyway.database.postgres)
 
+    testImplementation(libs.edc.junit)
     testImplementation(testFixtures(libs.edc.sql.core))
 }
diff --git a/edc-extensions/migrations/data-plane-migration/build.gradle.kts b/edc-extensions/migrations/data-plane-migration/build.gradle.kts
index 2ff1aa7fa..fbb1187b2 100644
--- a/edc-extensions/migrations/data-plane-migration/build.gradle.kts
+++ b/edc-extensions/migrations/data-plane-migration/build.gradle.kts
@@ -25,7 +25,6 @@ plugins {
 dependencies {
     implementation(project(":edc-extensions:migrations:postgresql-migration-lib"))
     implementation(libs.edc.spi.core)
-    implementation(libs.edc.junit)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.sql.assetindex)
     implementation(libs.edc.sql.core)
@@ -37,5 +36,6 @@ dependencies {
     // https://documentation.red-gate.com/flyway/release-notes-and-older-versions/release-notes-for-flyway-engine
     runtimeOnly(libs.flyway.database.postgres)
 
+    testImplementation(libs.edc.junit)
     testImplementation(testFixtures(libs.edc.sql.core))
 }
diff --git a/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts b/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts
index e993eec8b..22894fe42 100644
--- a/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts
+++ b/edc-extensions/migrations/postgresql-migration-lib/build.gradle.kts
@@ -25,7 +25,6 @@ plugins {
 dependencies {
     implementation(project(":core:core-utils"))
     implementation(libs.edc.spi.core)
-    implementation(libs.edc.junit)
     implementation(libs.edc.spi.transaction.datasource)
     implementation(libs.edc.sql.assetindex)
     implementation(libs.edc.sql.core)
@@ -36,4 +35,6 @@ dependencies {
     // so we need to add PG support explicitly
     // https://documentation.red-gate.com/flyway/release-notes-and-older-versions/release-notes-for-flyway-engine
     runtimeOnly(libs.flyway.database.postgres)
+
+    testImplementation(libs.edc.junit)
 }