diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java
index 505bdf17738e..cd0c2ef7e14e 100644
--- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java
+++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java
@@ -41,6 +41,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -157,8 +158,7 @@ void traceRequest(boolean useCache) throws IOException {
                     span.hasName("test-http-server").hasKind(SERVER).hasParent(trace.getSpan(3))));
   }
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
+  @RepeatedTest(10)
   void testBrokenApiUsage() throws IOException {
     URL url = resolveAddress("/success").toURL();
     HttpURLConnection connection =
diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java
index 98ed71fa5dd8..2e748788d287 100644
--- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java
+++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java
@@ -5,21 +5,12 @@
 
 package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
 
-import static io.opentelemetry.api.common.AttributeKey.booleanKey;
-import static io.opentelemetry.api.common.AttributeKey.stringKey;
-
-import io.opentelemetry.api.common.AttributeKey;
-
 class ExperimentalTestHelper {
-  private static final boolean isEnabled =
+  private static final boolean EXPERIMENTAL_ATTRIBUTES =
       Boolean.getBoolean("otel.instrumentation.hystrix.experimental-span-attributes");
 
-  static final AttributeKey<String> HYSTRIX_COMMAND = stringKey("hystrix.command");
-  static final AttributeKey<String> HYSTRIX_GROUP = stringKey("hystrix.group");
-  static final AttributeKey<Boolean> HYSTRIX_CIRCUIT_OPEN = booleanKey("hystrix.circuit_open");
-
   static <T> T experimental(T value) {
-    if (isEnabled) {
+    if (EXPERIMENTAL_ATTRIBUTES) {
       return value;
     }
     return null;
diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java
index 186ff7a4a4f8..8758956354bc 100644
--- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java
+++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java
@@ -5,9 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
 
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN;
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND;
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP;
+import static io.opentelemetry.api.common.AttributeKey.booleanKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -94,9 +93,9 @@ protected Observable<String> construct() {
                     span.hasName("ExampleGroup.TestCommand.execute")
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
                 span ->
                     span.hasName("tracedMethod")
                         .hasParent(trace.getSpan(1))
@@ -105,9 +104,10 @@ protected Observable<String> construct() {
                     span.hasName("OtherGroup.AnotherTestCommand.execute")
                         .hasParent(trace.getSpan(1))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("AnotherTestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("OtherGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
+                            equalTo(
+                                stringKey("hystrix.command"), experimental("AnotherTestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("OtherGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
                 span ->
                     span.hasName("anotherTracedMethod")
                         .hasParent(trace.getSpan(3))
diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java
index 99d702b11258..24c3dae5b3a2 100644
--- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java
+++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java
@@ -5,9 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
 
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN;
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND;
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP;
+import static io.opentelemetry.api.common.AttributeKey.booleanKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -84,9 +83,9 @@ protected Observable<String> construct() {
                     span.hasName("ExampleGroup.TestCommand.execute")
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
                 span ->
                     span.hasName("tracedMethod")
                         .hasParent(trace.getSpan(1))
@@ -290,16 +289,16 @@ protected Observable<String> resumeWithFallback() {
                         .hasStatus(StatusData.error())
                         .hasException(new IllegalArgumentException())
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
                 span ->
                     span.hasName("ExampleGroup.TestCommand.fallback")
                         .hasParent(trace.getSpan(1))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false)))));
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false)))));
   }
 
   private static Stream<Arguments> provideCommandFallbackArguments() {
@@ -388,17 +387,17 @@ protected Observable<String> construct() {
                         .hasStatus(StatusData.error())
                         .hasException(exception.getCause())
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("FailingGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("FailingGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
                 span ->
                     span.hasName("FailingGroup.TestCommand.fallback")
                         .hasParent(trace.getSpan(1))
                         .hasException(hystrixRuntimeException.getFallbackException())
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("FailingGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false)))));
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("FailingGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false)))));
   }
 
   private static Stream<Arguments> provideCommandNoFallbackResultsInErrorArguments() {
diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java
index 07c41a0a4cd3..9f54d3ee8bb6 100644
--- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java
+++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java
@@ -5,9 +5,8 @@
 
 package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
 
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN;
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND;
-import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP;
+import static io.opentelemetry.api.common.AttributeKey.booleanKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -66,9 +65,9 @@ private String tracedMethod() {
                     span.hasName("ExampleGroup.TestCommand.execute")
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
                 span ->
                     span.hasName("tracedMethod")
                         .hasParent(trace.getSpan(1))
@@ -109,16 +108,16 @@ protected String getFallback() {
                         .hasStatus(StatusData.error())
                         .hasException(new IllegalArgumentException())
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
                 span ->
                     span.hasName("ExampleGroup.TestCommand.fallback")
                         .hasParent(trace.getSpan(1))
                         .hasAttributesSatisfyingExactly(
-                            equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
-                            equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
-                            equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false)))));
+                            equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
+                            equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
+                            equalTo(booleanKey("hystrix.circuit_open"), experimental(false)))));
   }
 
   private static Stream<Arguments> provideCommandActionArguments() {
diff --git a/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts b/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts
index 2cb65998cad9..072a96df450f 100644
--- a/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts
+++ b/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts
@@ -1,7 +1,3 @@
 plugins {
   id("otel.javaagent-bootstrap")
 }
-
-dependencies {
-  compileOnly(project(":javaagent-bootstrap"))
-}
diff --git a/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts b/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts
index d989f9426f0b..602a07ab0a82 100644
--- a/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts
+++ b/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts
@@ -21,8 +21,6 @@ muzzle {
 dependencies {
   bootstrap(project(":instrumentation:internal:internal-application-logger:bootstrap"))
 
-  compileOnly(project(":javaagent-bootstrap"))
-
   compileOnly("org.slf4j:slf4j-api") {
     version {
       // 1.4.0 introduced the TRACE logging level
diff --git a/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts b/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts
index bb56f554cf60..e0b30b60cec8 100644
--- a/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts
+++ b/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts
@@ -5,7 +5,6 @@ plugins {
 }
 
 dependencies {
-  compileOnly(project(":javaagent-bootstrap"))
   compileOnly(project(":javaagent-tooling"))
   compileOnly(project(":instrumentation:internal:internal-class-loader:compile-stub"))