diff --git a/.github/workflows/build-agents.yml b/.github/workflows/build-agents.yml
index e7c83c7..1dbd318 100644
--- a/.github/workflows/build-agents.yml
+++ b/.github/workflows/build-agents.yml
@@ -1,25 +1,29 @@
-name: Build Webmethods Discovery and Traceability Agents
+name: Build agents
 
 on:
   push:
     branches: [main, '*']
 
 jobs:
-  test:
-    env:
-      GOFLAGS: "-mod=mod"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.21
-      - name: Test
-        working-directory: .
-        run: |
-          make test
-  build:
+  testAgents:
+    uses: ./.github/workflows/run-tests.yml
+
+  # test:
+  #   env:
+  #     GOFLAGS: "-mod=mod"
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Set up Go
+  #       uses: actions/setup-go@v5
+  #       with:
+  #         go-version: 1.21
+  #     - name: Test
+  #       working-directory: .
+  #       run: |
+  #         make test
+
+  buildAgents:
     env:
       GOFLAGS: "-mod=mod"
       VERSION: ${{ github.ref_name }}
diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml
index b9c13ef..0c59cda 100644
--- a/.github/workflows/build-docker-images.yml
+++ b/.github/workflows/build-docker-images.yml
@@ -1,4 +1,4 @@
-name: Discovery Agent Docker
+name: Build docker images
 
 on:
   push:
@@ -6,7 +6,11 @@ on:
       - "*"
 
 jobs:
+  testAgents:
+    uses: ./.github/workflows/run-tests.yml
+
   buildDiscoveryAgentDocker:
+    needs: testAgents
     env:
       GOFLAGS: "-mod=mod"
       GOWORK: "off"
@@ -48,6 +52,7 @@ jobs:
               COMMIT_ID=${{ env.commitId }}
 
   buildTraceabilityAgentDocker:
+    needs: testAgents
     env:
       GOFLAGS: "-mod=mod"
       GOWORK: "off"
@@ -92,6 +97,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [buildDiscoveryAgentDocker, buildTraceabilityAgentDocker]
     steps:
+      - uses: actions/checkout@v4
       - name: Notify Teams channel
         env:
           TEAMS_WEBHOOK_URL: ${{ secrets.TEAMS_WEBHOOK_URL }}
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
new file mode 100644
index 0000000..6bc7b91
--- /dev/null
+++ b/.github/workflows/run-tests.yml
@@ -0,0 +1,20 @@
+name: Test the agents
+
+on:
+  workflow_call
+
+jobs:
+  test:
+    env:
+      GOFLAGS: "-mod=mod"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.21
+      - name: Test
+        working-directory: .
+        run: |
+          make test