diff --git a/.circleci/config.templ.yml b/.circleci/config.templ.yml
index 761e9845f7e..abc7b635185 100644
--- a/.circleci/config.templ.yml
+++ b/.circleci/config.templ.yml
@@ -556,44 +556,12 @@ jobs:
           env: 'dd_coverage'
           snapshot: true
 
-  llmobs:
-    <<: *contrib_job
-    steps:
-      - run_test:
-          pattern: "llmobs"
-
-  subprocess:
-    <<: *contrib_job_small
-    steps:
-      - run_test:
-          pattern: "subprocess"
-
   sourcecode:
     <<: *contrib_job_small
     steps:
       - run_test:
           pattern: "sourcecode"
 
-  debugger:
-    <<: *contrib_job
-    steps:
-      - run_test:
-          pattern: "debugger"
-
-  openai:
-    <<: *machine_executor
-    parallelism: 10
-    steps:
-      - run_test:
-          pattern: 'openai'
-          snapshot: true
-
-  opentracer:
-    <<: *contrib_job_large
-    steps:
-      - run_test:
-          pattern: 'opentracer'
-
   opentelemetry:
     parallelism: 4
     <<: *machine_executor
@@ -611,24 +579,6 @@ jobs:
           snapshot: true
           docker_services: "localstack"
 
-  test_logging:
-    <<: *contrib_job
-    docker:
-      - image: *ddtrace_dev_image
-      - *testagent
-    steps:
-      - run_test:
-          pattern: 'test_logging'
-
-  stdlib:
-    <<: *contrib_job
-    docker:
-      - image: *ddtrace_dev_image
-      - *testagent
-    steps:
-      - run_test:
-          pattern: 'asyncio$|sqlite3$|futures$|dbapi$|dbapi_async$'
-
   asyncpg:
     <<: *machine_executor
     steps:
@@ -709,13 +659,6 @@ jobs:
           snapshot: true
           docker_services: "memcached redis postgres"
 
-  django_hosts:
-    <<: *machine_executor
-    steps:
-      - run_test:
-          pattern: 'django_hosts$'
-          snapshot: true
-
   djangorestframework:
     <<: *machine_executor
     parallelism: 2
@@ -822,20 +765,6 @@ jobs:
           pattern: 'pytest'
           snapshot: true
 
-  pytest_v2:
-    <<: *machine_executor
-    parallelism: 10
-    steps:
-     - run_hatch_env_test:
-          env: 'pytest_plugin_v2'
-          snapshot: true
-
-  asynctest:
-    executor: ddtrace_dev
-    steps:
-      - run_test:
-          pattern: 'asynctest$'
-
   pymemcache:
     <<: *contrib_job
     docker:
@@ -938,36 +867,6 @@ jobs:
           wait: rabbitmq
           pattern: 'kombu'
 
-  langchain:
-    <<: *machine_executor
-    parallelism: 6
-    steps:
-      - run_test:
-          pattern: "langchain"
-          snapshot: true
-
-  anthropic:
-    <<: *machine_executor
-    parallelism: 3
-    steps:
-      - run_test:
-          pattern: "anthropic"
-          snapshot: true
-
-  logbook:
-    <<: *machine_executor
-    steps:
-      - run_test:
-          pattern: 'logbook'
-          snapshot: true
-
-  loguru:
-    <<: *machine_executor
-    steps:
-      - run_test:
-          pattern: 'loguru'
-          snapshot: true
-
   build_docs:
     # build documentation and store as an artifact
     executor: ddtrace_dev
diff --git a/.gitlab/tests.yml b/.gitlab/tests.yml
index dc50b1a8366..5d96738b493 100644
--- a/.gitlab/tests.yml
+++ b/.gitlab/tests.yml
@@ -53,5 +53,6 @@ include:
   - local: ".gitlab/tests/appsec.yml"
   - local: ".gitlab/tests/contrib.yml"
   - local: ".gitlab/tests/core.yml"
+  - local: ".gitlab/tests/debugging.yml"
   - local: ".gitlab/tests/tracer.yml"
   - local: ".gitlab/tests/profiling.yml"
diff --git a/.gitlab/tests/contrib.yml b/.gitlab/tests/contrib.yml
index 7ca9bae3186..b26aa9dbabc 100644
--- a/.gitlab/tests/contrib.yml
+++ b/.gitlab/tests/contrib.yml
@@ -194,3 +194,73 @@ wsgi:
   extends: .test_base_riot_snapshot
   variables:
     SUITE_NAME: "wsgi"
+
+langchain:
+  extends: .test_base_riot_snapshot
+  parallel: 6
+  variables:
+    SUITE_NAME: "langchain"
+
+anthropic:
+  extends: .test_base_riot_snapshot
+  parallel: 3
+  variables:
+    SUITE_NAME: "anthropic"
+
+loguru:
+  extends: .test_base_riot_snapshot
+  variables:
+    SUITE_NAME: "loguru"
+
+logbook:
+  extends: .test_base_riot_snapshot
+  variables:
+    SUITE_NAME: "logbook"
+
+asynctest:
+  extends: .test_base_riot
+  variables:
+    SUITE_NAME: 'asynctest$'
+
+pytest_v2:
+  extends: .test_base_riot_snapshot
+  parallel: 10
+  variables:
+    SUITE_NAME: 'pytest_plugin_v2'
+
+django_hosts:
+  extends: .test_base_riot_snapshot
+  variables:
+    SUITE_NAME: 'django_hosts$'
+
+test_logging:
+  extends: .test_base_riot_snapshot
+  variables:
+    SUITE_NAME: 'test_logging'
+
+stdlib:
+  extends: .test_base_riot_snapshot
+  variables:
+    SUITE_NAME: 'asyncio$|sqlite3$|futures$|dbapi$|dbapi_async$'
+
+llmobs:
+  extends: .test_base_riot
+  variables:
+    SUITE_NAME: "llmobs"
+
+subprocess:
+  extends: .test_base_riot
+  variables:
+    SUITE_NAME: "subprocess"
+
+openai:
+  extends: .test_base_riot_snapshot
+  parallel: 10
+  variables:
+    SUITE_NAME: "openai"
+
+opentracer:
+  extends: .test_base_riot
+  variables:
+    SUITE_NAME: "opentracer"
+
diff --git a/.gitlab/tests/debugging.yml b/.gitlab/tests/debugging.yml
new file mode 100644
index 00000000000..644073eb50e
--- /dev/null
+++ b/.gitlab/tests/debugging.yml
@@ -0,0 +1,5 @@
+debugger:
+  extends: .test_base_riot
+  variables:
+    SUITE_NAME: "debugger"
+