diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6407e4f21d..9d29d3ed36 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -233,7 +233,7 @@ plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-pl
 plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version = "0.4.5" }
 plugin-downloadTask = { module = "de.undercouch:gradle-download-task", version = "5.6.0" }
 plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" }
-plugin-bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0"
+plugin-bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:7.1.0"
 
 [plugins]
 kotlin19 = { id = "org.jetbrains.kotlin.jvm", version = "1.9.25" }
diff --git a/micrometer-java11/build.gradle b/micrometer-java11/build.gradle
index 10364ba871..7a3c4be3ae 100644
--- a/micrometer-java11/build.gradle
+++ b/micrometer-java11/build.gradle
@@ -3,6 +3,7 @@ description 'Micrometer core classes that require Java 11'
 dependencies {
     api project(":micrometer-core")
 
+    testImplementation 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0'
     testImplementation project(":micrometer-test")
     testImplementation 'ru.lanwen.wiremock:wiremock-junit5'
     testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
diff --git a/micrometer-java21/build.gradle b/micrometer-java21/build.gradle
index c8700350f4..14831f997b 100644
--- a/micrometer-java21/build.gradle
+++ b/micrometer-java21/build.gradle
@@ -8,6 +8,7 @@ if (!javaLanguageVersion.canCompileOrRun(21)) {
 dependencies {
     api project(':micrometer-core')
 
+    testImplementation 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0'
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'org.awaitility:awaitility'
diff --git a/micrometer-osgi-test/build.gradle b/micrometer-osgi-test/build.gradle
index d6ffd9152b..2c7297a39c 100644
--- a/micrometer-osgi-test/build.gradle
+++ b/micrometer-osgi-test/build.gradle
@@ -26,7 +26,6 @@ dependencies {
 def testingBundle = tasks.register('testingBundle', Bundle) {
     archiveClassifier = 'tests'
     from sourceSets.test.output
-    sourceSet = sourceSets.test
 
     bundle {
         bnd """\