diff --git a/.github/workflows/test-compatibility.yml b/.github/workflows/test-compatibility.yml
index 50c4a3f22..39254de68 100644
--- a/.github/workflows/test-compatibility.yml
+++ b/.github/workflows/test-compatibility.yml
@@ -55,7 +55,7 @@ jobs:
         run: |
           export OPENSEARCH_VERSION=${{ matrix.entry.opensearch_version }}
           export SECURE_INTEGRATION=${{ matrix.secured }}
-          make cluster.get-cert test-integ race=true
+          make cluster.get-cert test-integ-base test-integ-plugin race=true
 
       - name: Stop the OpenSearch cluster
         run: |
diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml
index 7925cf872..549e3fb4e 100644
--- a/.github/workflows/test-integration-unreleased.yml
+++ b/.github/workflows/test-integration-unreleased.yml
@@ -65,7 +65,7 @@ jobs:
 
       - name: Integration test
         working-directory: go-client
-        run: make test-integ race=true unreleased=true
+        run: make test-integ-base race=true
         env:
           OPENSEARCH_GO_SKIP_JSON_COMPARE: true
       
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 2862b8fd1..5a90eedee 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -26,7 +26,7 @@ jobs:
           for attempt in `seq 25`; do sleep 5; \
           if curl -s localhost:9200; \
           then echo '=====> ready'; break; fi; if [ $attempt == 25 ]; then exit 1; fi; echo '=====> waiting...'; done
-      - run: make test-integ race=true
+      - run: make test-integ-base test-integ-plugin race=true
 
   secured:
     name: Tests against secure cluster
@@ -50,7 +50,7 @@ jobs:
           for attempt in `seq 25`; do sleep 5; \
           if curl -s -ku admin:myStrongPassword123! https://localhost:9200; \
           then echo '=====> ready'; break; fi; if [ $attempt == 25 ]; then exit 1; fi; echo '=====> waiting...'; done
-      - run: make cluster.get-cert test-integ-secure race=true coverage=true
+      - run: make cluster.get-cert test-integ-base test-integ-plugin race=true coverage=true
       - uses: codecov/codecov-action@v4
         with:
           file: tmp/integ.cov