diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 8efdf1c48a1ce1..c02350eb7d8278 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -13,7 +13,7 @@ jobs:
     needs:
     - cache
 
-    uses: ./.github/workflows/tests/test-common.yml
+    uses: ./.github/workflows/test-common.yml
     with:
       repo: core
 
@@ -25,7 +25,7 @@ jobs:
     needs:
     - cache
 
-    uses: ./.github/workflows/tests/test-dbm.yml
+    uses: ./.github/workflows/test-dbm.yml
     with:
       repo: core
 
@@ -37,7 +37,7 @@ jobs:
     needs:
     - cache
 
-    uses: ./.github/workflows/tests/test-all.yml
+    uses: ./.github/workflows/test-all.yml
     with:
       repo: core
 
diff --git a/.github/workflows/nightly-base-package.yml b/.github/workflows/nightly-base-package.yml
index 5f91bb4c70eb34..240b8bf2c74a28 100644
--- a/.github/workflows/nightly-base-package.yml
+++ b/.github/workflows/nightly-base-package.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test-common:
-    uses: ./.github/workflows/tests/test-common.yml
+    uses: ./.github/workflows/test-common.yml
     with:
       repo: core
 
@@ -18,7 +18,7 @@ jobs:
     secrets: inherit
   
   test-dbm:
-    uses: ./.github/workflows/tests/test-dbm.yml
+    uses: ./.github/workflows/test-dbm.yml
     with:
       repo: core
 
@@ -29,7 +29,7 @@ jobs:
     secrets: inherit
   
   test-integrations:
-    uses: ./.github/workflows/tests/test-all.yml
+    uses: ./.github/workflows/test-all.yml
     with:
       repo: core
 
diff --git a/.github/workflows/nightly-py2.yml b/.github/workflows/nightly-py2.yml
index 8b093d2b4361e7..3056aadeefc4a7 100644
--- a/.github/workflows/nightly-py2.yml
+++ b/.github/workflows/nightly-py2.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test-common:
-    uses: ./.github/workflows/tests/test-common.yml
+    uses: ./.github/workflows/test-common.yml
     with:
       repo: core
 
@@ -18,7 +18,7 @@ jobs:
     secrets: inherit
   
   test-dbm:
-    uses: ./.github/workflows/tests/test-dbm.yml
+    uses: ./.github/workflows/test-dbm.yml
     with:
       repo: core
 
@@ -29,7 +29,7 @@ jobs:
     secrets: inherit
   
   test-integrations:
-    uses: ./.github/workflows/tests/test-all.yml
+    uses: ./.github/workflows/test-all.yml
     with:
       repo: core
 
diff --git a/.github/workflows/pr-all.yml b/.github/workflows/pr-all.yml
index 419f3e101539fe..22677fafdb0f82 100644
--- a/.github/workflows/pr-all.yml
+++ b/.github/workflows/pr-all.yml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   test-common:
-    uses: ./.github/workflows/tests/test-common.yml
+    uses: ./.github/workflows/test-common.yml
     with:
       repo: core
 
@@ -26,7 +26,7 @@ jobs:
     secrets: inherit
 
   test-dbm:
-    uses: ./.github/workflows/tests/test-dbm.yml
+    uses: ./.github/workflows/test-dbm.yml
     with:
       repo: core
 
@@ -36,7 +36,7 @@ jobs:
     secrets: inherit
 
   test-integrations:
-    uses: ./.github/workflows/tests/test-all.yml
+    uses: ./.github/workflows/test-all.yml
     with:
       repo: core
 
diff --git a/.github/workflows/submit-traces.yml b/.github/workflows/submit-traces.yml
index 76ebd18e496196..7d29aed34bdd69 100644
--- a/.github/workflows/submit-traces.yml
+++ b/.github/workflows/submit-traces.yml
@@ -33,6 +33,9 @@ jobs:
         path: captured-traces
       continue-on-error: true
 
+    - name: Create captured-traces directory
+      run: mkdir -p captured-traces
+      
     - name: Replay
       if: steps.download.outcome == 'success'
       run: |-
diff --git a/.github/workflows/test-agent.yml b/.github/workflows/test-agent.yml
index b1acca3a05dd44..8e361b3327b5a8 100644
--- a/.github/workflows/test-agent.yml
+++ b/.github/workflows/test-agent.yml
@@ -36,7 +36,7 @@ on:
 
 jobs:
   test-common:
-    uses: ./.github/workflows/tests/test-common.yml
+    uses: ./.github/workflows/test-common.yml
     with:
       repo: core
 
@@ -51,7 +51,7 @@ jobs:
     secrets: inherit
   
   test-dbm:
-    uses: ./.github/workflows/tests/test-dbm.yml
+    uses: ./.github/workflows/test-dbm.yml
     with:
       repo: core
 
@@ -66,7 +66,7 @@ jobs:
     secrets: inherit
   
   test-integrations:
-    uses: ./.github/workflows/tests/test-all.yml
+    uses: ./.github/workflows/test-all.yml
     with:
       repo: core
 
diff --git a/.github/workflows/tests/test-all.yml b/.github/workflows/test-all.yml
similarity index 100%
rename from .github/workflows/tests/test-all.yml
rename to .github/workflows/test-all.yml
diff --git a/.github/workflows/tests/test-common.yml b/.github/workflows/test-common.yml
similarity index 100%
rename from .github/workflows/tests/test-common.yml
rename to .github/workflows/test-common.yml
diff --git a/.github/workflows/tests/test-dbm.yml b/.github/workflows/test-dbm.yml
similarity index 100%
rename from .github/workflows/tests/test-dbm.yml
rename to .github/workflows/test-dbm.yml
diff --git a/.github/workflows/weekly-latest.yml b/.github/workflows/weekly-latest.yml
index 1f915f4b62b89e..65319b5f58413c 100644
--- a/.github/workflows/weekly-latest.yml
+++ b/.github/workflows/weekly-latest.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test-common:
-    uses: ./.github/workflows/tests/test-common.yml
+    uses: ./.github/workflows/test-common.yml
     with:
       repo: core
 
@@ -16,7 +16,7 @@ jobs:
     secrets: inherit
 
   test-dbm:
-    uses: ./.github/workflows/tests/test-dbm.yml
+    uses: ./.github/workflows/test-dbm.yml
     with:
       repo: core
 
@@ -25,7 +25,7 @@ jobs:
     secrets: inherit
   
   test-integrations:
-    uses: ./.github/workflows/tests/test-all.yml
+    uses: ./.github/workflows/test-all.yml
     with:
       repo: core
 
diff --git a/ddev/src/ddev/cli/validate/ci.py b/ddev/src/ddev/cli/validate/ci.py
index f396993b5514e5..ca581904f7f2ec 100644
--- a/ddev/src/ddev/cli/validate/ci.py
+++ b/ddev/src/ddev/cli/validate/ci.py
@@ -128,7 +128,7 @@ def ci(app: Application, sync: bool):
     missing_jobs = {}
     invalid_jobs = {}
     for jobs_workflow_file in jobs_workflow_files:
-        jobs_workflow_path = app.repo.path / '.github' / 'workflows' / 'tests' / jobs_workflow_file
+        jobs_workflow_path = app.repo.path / '.github' / 'workflows' / jobs_workflow_file
         with jobs_workflow_path.open() as workflow_file:
             original_jobs_workflow = yaml.safe_load(workflow_file)
             workflow_job_data[jobs_workflow_file] = {
diff --git a/docs/developer/meta/ci/testing.md b/docs/developer/meta/ci/testing.md
index b505c1624b0d26..3377cdfb584064 100644
--- a/docs/developer/meta/ci/testing.md
+++ b/docs/developer/meta/ci/testing.md
@@ -144,7 +144,7 @@ exclude = true
 
 ## Target enumeration
 
-The [list](https://github.com/DataDog/integrations-core/blob/master/.github/workflows/tests/test-all.yml) of all jobs is [generated](validation.md#ci-configuration) as the `/.github/workflows/tests/test-all.yml` file.
+The [list](https://github.com/DataDog/integrations-core/blob/master/.github/workflows/test-all.yml) of all jobs is [generated](validation.md#ci-configuration) as the `/.github/workflows/test-all.yml` file.
 
 This reusable workflow is called by workflows that need to test everything.