diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/groovy/SpringSchedulingTest.groovy b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/groovy/SpringSchedulingTest.groovy
deleted file mode 100644
index 2d0d0fece9..0000000000
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/groovy/SpringSchedulingTest.groovy
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import io.opentelemetry.api.trace.StatusCode
-import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification
-import io.opentelemetry.semconv.SemanticAttributes
-import org.springframework.context.annotation.AnnotationConfigApplicationContext
-
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-class SpringSchedulingTest extends AgentInstrumentationSpecification {
-
-  def "schedule one time test"() {
-    setup:
-    def context = new AnnotationConfigApplicationContext(OneTimeTaskConfig)
-    def task = context.getBean(OneTimeTask)
-
-    task.blockUntilExecute()
-
-    expect:
-    assert task != null
-    assertTraces(0) {}
-  }
-
-  def "schedule trigger test according to cron expression"() {
-    setup:
-    def context = new AnnotationConfigApplicationContext(TriggerTaskConfig)
-    def task = context.getBean(TriggerTask)
-
-    task.blockUntilExecute()
-
-    expect:
-    assert task != null
-    assertTraces(1) {
-      trace(0, 1) {
-        span(0) {
-          name "TriggerTask.run"
-          hasNoParent()
-          attributes {
-            "job.system" "spring_scheduling"
-            "code.namespace" "TriggerTask"
-            "code.function" "run"
-          }
-        }
-      }
-    }
-  }
-
-  def "schedule interval test"() {
-    setup:
-    def context = new AnnotationConfigApplicationContext(IntervalTaskConfig)
-    def task = context.getBean(IntervalTask)
-
-    task.blockUntilExecute()
-
-    expect:
-    assert task != null
-    assertTraces(1) {
-      trace(0, 1) {
-        span(0) {
-          name "IntervalTask.run"
-          hasNoParent()
-          attributes {
-            "job.system" "spring_scheduling"
-            "code.namespace" "IntervalTask"
-            "code.function" "run"
-          }
-        }
-      }
-    }
-  }
-
-  def "schedule lambda test"() {
-    setup:
-    def context = new AnnotationConfigApplicationContext(LambdaTaskConfig)
-    def configurer = context.getBean(LambdaTaskConfigurer)
-
-    configurer.singleUseLatch.await(2000, TimeUnit.MILLISECONDS)
-
-    expect:
-    assertTraces(1) {
-      trace(0, 1) {
-        span(0) {
-          name "LambdaTaskConfigurer\$\$Lambda.run"
-          hasNoParent()
-          attributes {
-            "job.system" "spring_scheduling"
-            "code.namespace" { it.startsWith("LambdaTaskConfigurer\$\$Lambda") }
-            "code.function" "run"
-          }
-        }
-      }
-    }
-
-    cleanup:
-    context.close()
-  }
-
-  // by putting the scheduled method directly on the TaskConfig, this verifies the case where the
-  // class is enhanced and so has a different class name, e.g. TaskConfig$$EnhancerByCGLIB$$b910c4a9
-  def "schedule enhanced class test"() {
-    setup:
-    def context = new AnnotationConfigApplicationContext(EnhancedClassTaskConfig)
-    def latch = context.getBean(CountDownLatch)
-
-    latch.await(5, TimeUnit.SECONDS)
-
-    expect:
-    assertTraces(1) {
-      trace(0, 1) {
-        span(0) {
-          name "EnhancedClassTaskConfig.run"
-          hasNoParent()
-          attributes {
-            "job.system" "spring_scheduling"
-            "code.namespace" "EnhancedClassTaskConfig"
-            "code.function" "run"
-          }
-        }
-      }
-    }
-  }
-
-  def "task with error test"() {
-    setup:
-    def context = new AnnotationConfigApplicationContext(TaskWithErrorConfig)
-    def task = context.getBean(TaskWithError)
-
-    task.blockUntilExecute()
-
-    expect:
-    assert task != null
-    assertTraces(1) {
-      trace(0, 2) {
-        span(0) {
-          name "TaskWithError.run"
-          hasNoParent()
-          status StatusCode.ERROR
-          attributes {
-            "job.system" "spring_scheduling"
-            "code.namespace" "TaskWithError"
-            "code.function" "run"
-          }
-          event(0) {
-            eventName "$SemanticAttributes.EXCEPTION_EVENT_NAME"
-            attributes {
-              "$SemanticAttributes.EXCEPTION_TYPE" IllegalStateException.getName()
-              "$SemanticAttributes.EXCEPTION_MESSAGE" "failure"
-              "$SemanticAttributes.EXCEPTION_STACKTRACE" String
-            }
-          }
-        }
-        span(1) {
-          name "error-handler"
-          childOf(span(0))
-        }
-      }
-    }
-  }
-}
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java
new file mode 100644
index 0000000000..3482db9ae5
--- /dev/null
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/SpringSchedulingTest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1;
+
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.IntervalTask;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.OneTimeTask;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.TaskWithError;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.TriggerTask;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.EnhancedClassTaskConfig;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.IntervalTaskConfig;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.LambdaTaskConfig;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.OneTimeTaskConfig;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.TaskWithErrorConfig;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config.TriggerTaskConfig;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.service.LambdaTaskConfigurer;
+import io.opentelemetry.sdk.trace.data.StatusData;
+import io.opentelemetry.semconv.SemanticAttributes;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+class SpringSchedulingTest {
+
+  @RegisterExtension
+  private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
+
+  @Test
+  void scheduleOneTimeTest() throws InterruptedException {
+    try (AnnotationConfigApplicationContext context =
+        new AnnotationConfigApplicationContext(OneTimeTaskConfig.class)) {
+      OneTimeTask task = context.getBean(OneTimeTask.class);
+      task.blockUntilExecute();
+
+      assertThat(task).isNotNull();
+      assertThat(testing.waitForTraces(0)).isEmpty();
+    }
+  }
+
+  @Test
+  void scheduleCronExpressionTest() throws InterruptedException {
+    try (AnnotationConfigApplicationContext context =
+        new AnnotationConfigApplicationContext(TriggerTaskConfig.class)) {
+      TriggerTask task = context.getBean(TriggerTask.class);
+      task.blockUntilExecute();
+
+      assertThat(task).isNotNull();
+      testing.waitAndAssertTraces(
+          trace ->
+              trace.hasSpansSatisfyingExactly(
+                  span ->
+                      span.hasName("TriggerTask.run")
+                          .hasNoParent()
+                          .hasAttributesSatisfyingExactly(
+                              equalTo(AttributeKey.stringKey("job.system"), "spring_scheduling"),
+                              equalTo(
+                                  AttributeKey.stringKey("code.namespace"),
+                                  TriggerTask.class.getName()),
+                              equalTo(AttributeKey.stringKey("code.function"), "run"))));
+    }
+  }
+
+  @Test
+  void scheduleIntervalTest() throws InterruptedException {
+    try (AnnotationConfigApplicationContext context =
+        new AnnotationConfigApplicationContext(IntervalTaskConfig.class)) {
+      IntervalTask task = context.getBean(IntervalTask.class);
+      task.blockUntilExecute();
+
+      assertThat(task).isNotNull();
+      testing.waitAndAssertTraces(
+          trace ->
+              trace.hasSpansSatisfyingExactly(
+                  span ->
+                      span.hasName("IntervalTask.run")
+                          .hasNoParent()
+                          .hasAttributesSatisfyingExactly(
+                              equalTo(AttributeKey.stringKey("job.system"), "spring_scheduling"),
+                              equalTo(
+                                  AttributeKey.stringKey("code.namespace"),
+                                  IntervalTask.class.getName()),
+                              equalTo(AttributeKey.stringKey("code.function"), "run"))));
+    }
+  }
+
+  @Test
+  void scheduleLambdaTest() throws InterruptedException {
+    try (AnnotationConfigApplicationContext context =
+        new AnnotationConfigApplicationContext(LambdaTaskConfig.class)) {
+      LambdaTaskConfigurer configurer = context.getBean(LambdaTaskConfigurer.class);
+      configurer.singleUseLatch.await(2000, TimeUnit.MILLISECONDS);
+
+      assertThat(configurer).isNotNull();
+      testing.waitAndAssertTraces(
+          trace ->
+              trace.hasSpansSatisfyingExactly(
+                  span ->
+                      span.hasName("LambdaTaskConfigurer$$Lambda.run")
+                          .hasNoParent()
+                          .hasAttributesSatisfyingExactly(
+                              equalTo(AttributeKey.stringKey("job.system"), "spring_scheduling"),
+                              equalTo(AttributeKey.stringKey("code.function"), "run"),
+                              satisfies(
+                                  AttributeKey.stringKey("code.namespace"),
+                                  codeNamespace ->
+                                      codeNamespace
+                                          .isNotBlank()
+                                          .startsWith(
+                                              LambdaTaskConfigurer.class.getName()
+                                                  + "$$Lambda")))));
+    }
+  }
+
+  @Test
+  void scheduleEnhancedClassTest() throws InterruptedException {
+    try (AnnotationConfigApplicationContext context =
+        new AnnotationConfigApplicationContext(EnhancedClassTaskConfig.class)) {
+      CountDownLatch latch = context.getBean(CountDownLatch.class);
+      latch.await(5, TimeUnit.SECONDS);
+
+      assertThat(latch).isNotNull();
+      testing.waitAndAssertTraces(
+          trace ->
+              trace.hasSpansSatisfyingExactly(
+                  span ->
+                      span.hasName("EnhancedClassTaskConfig.run")
+                          .hasNoParent()
+                          .hasAttributesSatisfyingExactly(
+                              equalTo(AttributeKey.stringKey("job.system"), "spring_scheduling"),
+                              equalTo(
+                                  AttributeKey.stringKey("code.namespace"),
+                                  EnhancedClassTaskConfig.class.getName()),
+                              equalTo(AttributeKey.stringKey("code.function"), "run"))));
+    }
+  }
+
+  @Test
+  void taskWithErrorTest() throws InterruptedException {
+    try (AnnotationConfigApplicationContext context =
+        new AnnotationConfigApplicationContext(TaskWithErrorConfig.class)) {
+      TaskWithError task = context.getBean(TaskWithError.class);
+      task.blockUntilExecute();
+
+      assertThat(task).isNotNull();
+      testing.waitAndAssertTraces(
+          trace ->
+              trace.hasSpansSatisfyingExactly(
+                  span ->
+                      span.hasName("TaskWithError.run")
+                          .hasNoParent()
+                          .hasStatus(StatusData.error())
+                          .hasAttributesSatisfyingExactly(
+                              equalTo(AttributeKey.stringKey("job.system"), "spring_scheduling"),
+                              equalTo(
+                                  AttributeKey.stringKey("code.namespace"),
+                                  TaskWithError.class.getName()),
+                              equalTo(AttributeKey.stringKey("code.function"), "run"))
+                          .hasEventsSatisfyingExactly(
+                              event ->
+                                  event
+                                      .hasName(SemanticAttributes.EXCEPTION_EVENT_NAME)
+                                      .hasAttributesSatisfying(
+                                          equalTo(
+                                              SemanticAttributes.EXCEPTION_TYPE,
+                                              IllegalStateException.class.getName()),
+                                          equalTo(SemanticAttributes.EXCEPTION_MESSAGE, "failure"),
+                                          satisfies(
+                                              SemanticAttributes.EXCEPTION_STACKTRACE,
+                                              value -> value.isInstanceOf(String.class)))),
+                  span -> span.hasName("error-handler").hasParent(trace.getSpan(0))));
+    }
+  }
+}
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/IntervalTask.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/IntervalTask.java
similarity index 86%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/IntervalTask.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/IntervalTask.java
index d7143a0fde..ba4f395740 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/IntervalTask.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/IntervalTask.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/OneTimeTask.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/OneTimeTask.java
similarity index 84%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/OneTimeTask.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/OneTimeTask.java
index 511977a2df..4e36f34cdc 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/OneTimeTask.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/OneTimeTask.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.springframework.stereotype.Component;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TaskWithError.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/TaskWithError.java
similarity index 87%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TaskWithError.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/TaskWithError.java
index 12a69224ed..1d4526a96c 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TaskWithError.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/TaskWithError.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TriggerTask.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/TriggerTask.java
similarity index 86%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TriggerTask.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/TriggerTask.java
index 87003be136..d2e9060d00 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TriggerTask.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/component/TriggerTask.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.springframework.scheduling.annotation.Scheduled;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/EnhancedClassTaskConfig.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/EnhancedClassTaskConfig.java
similarity index 88%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/EnhancedClassTaskConfig.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/EnhancedClassTaskConfig.java
index e575167128..f840cd61d0 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/EnhancedClassTaskConfig.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/EnhancedClassTaskConfig.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config;
+
 import java.util.concurrent.CountDownLatch;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/IntervalTaskConfig.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/IntervalTaskConfig.java
similarity index 68%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/IntervalTaskConfig.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/IntervalTaskConfig.java
index 62fd7dbbca..e5c69d087c 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/IntervalTaskConfig.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/IntervalTaskConfig.java
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config;
+
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.IntervalTask;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/LambdaTaskConfig.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/LambdaTaskConfig.java
similarity index 68%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/LambdaTaskConfig.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/LambdaTaskConfig.java
index 4d7ec3a347..e77c448768 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/LambdaTaskConfig.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/LambdaTaskConfig.java
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config;
+
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.service.LambdaTaskConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/OneTimeTaskConfig.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/OneTimeTaskConfig.java
similarity index 68%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/OneTimeTaskConfig.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/OneTimeTaskConfig.java
index fbae8dd328..46246b9922 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/OneTimeTaskConfig.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/OneTimeTaskConfig.java
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config;
+
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.OneTimeTask;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TaskWithErrorConfig.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/TaskWithErrorConfig.java
similarity index 81%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TaskWithErrorConfig.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/TaskWithErrorConfig.java
index da9bbded1b..570034f696 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TaskWithErrorConfig.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/TaskWithErrorConfig.java
@@ -3,7 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config;
+
 import io.opentelemetry.instrumentation.testing.GlobalTraceUtil;
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.TaskWithError;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.TaskScheduler;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TriggerTaskConfig.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/TriggerTaskConfig.java
similarity index 68%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TriggerTaskConfig.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/TriggerTaskConfig.java
index c8fa9dc79f..f9f0dc891e 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/TriggerTaskConfig.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/config/TriggerTaskConfig.java
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.config;
+
+import io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.component.TriggerTask;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/LambdaTaskConfigurer.java b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/service/LambdaTaskConfigurer.java
similarity index 87%
rename from instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/LambdaTaskConfigurer.java
rename to instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/service/LambdaTaskConfigurer.java
index 59051a534b..d79607872b 100644
--- a/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/LambdaTaskConfigurer.java
+++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/scheduling/v3_1/spring/service/LambdaTaskConfigurer.java
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.spring.scheduling.v3_1.spring.service;
+
 import java.util.concurrent.CountDownLatch;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;