diff --git a/.buildkite/pipeline-master.yml b/.buildkite/pipeline-master.yml
index 164f38a04fd..7c92e666bb9 100644
--- a/.buildkite/pipeline-master.yml
+++ b/.buildkite/pipeline-master.yml
@@ -37,11 +37,6 @@ steps:
     command: "./scripts/buildkite/fossa.sh"
 
   - label: ":golang: unit test"
-    agents:
-      queue: "workers"
-    commands:
-      - "CASSANDRA_HOST=cassandra make install-schema && make cover_profile" # make install-schema is needed for a server startup test. See main_test.go
-      - "./scripts/buildkite/gen_coverage_metadata.sh .build/coverage/metadata.txt"
     artifact_paths:
       - ".build/coverage/*.out"
       - ".build/coverage/metadata.txt"
@@ -49,6 +44,19 @@ steps:
       automatic:
         limit: 1
     plugins:
+      - kubernetes:
+          <<: *kubernetes
+          podSpec:
+            <<: *podSpec
+            containers:
+              - <<: *commandContainer
+                command:
+                - |-
+                  # ensure that we are not rebuilding binaries and not regenerating code
+                  make .just-build
+                  # make install-schema is needed for a server startup test. See main_test.go
+                  CASSANDRA_HOST=cassandra make install-schema && make cover_profile
+                  ./scripts/buildkite/gen_coverage_metadata.sh .build/coverage/metadata.txt
       - docker-compose#v3.0.0:
           run: unit-test
           config: docker/buildkite/docker-compose.yml
@@ -112,6 +120,26 @@ steps:
           run: integration-test-cassandra
           config: docker/buildkite/docker-compose-es7.yml
 
+  - label: ":golang: integration test with cassandra with OpenSearch v2"
+    artifact_paths:
+      - ".build/coverage/*.out"
+    retry:
+      automatic:
+        limit: 1
+    plugins:
+      - kubernetes:
+          <<: *kubernetes
+          podSpec:
+            <<: *podSpec
+            containers:
+              - <<: *commandContainer
+                command:
+                - |-
+                  make cover_integration_profile
+      - docker-compose#v3.0.0:
+          run: integration-test-cassandra
+          config: docker/buildkite/docker-compose-opensearch2.yml
+
   - label: ":golang: integration ndc test with cassandra"
     artifact_paths:
       - ".build/coverage/*.out"
diff --git a/.buildkite/pipeline-pull-request.yml b/.buildkite/pipeline-pull-request.yml
index a6ebce9efc3..a062093fbe4 100644
--- a/.buildkite/pipeline-pull-request.yml
+++ b/.buildkite/pipeline-pull-request.yml
@@ -37,12 +37,6 @@ steps:
     command: "./scripts/buildkite/fossa.sh"
 
   - label: ":golang: unit test"
-    agents:
-      queue: "workers"
-    commands:
-      - "make .just-build" # ensure that we are not rebuilding binaries and not regenerating code
-      - "CASSANDRA_HOST=cassandra make install-schema && make cover_profile" # make install-schema is needed for a server startup test. See main_test.go
-      - "./scripts/buildkite/gen_coverage_metadata.sh .build/coverage/metadata.txt"
     artifact_paths:
       - ".build/coverage/*.out"
       - ".build/coverage/metadata.txt"
@@ -50,6 +44,19 @@ steps:
       automatic:
         limit: 1
     plugins:
+      - kubernetes:
+          <<: *kubernetes
+          podSpec:
+            <<: *podSpec
+            containers:
+              - <<: *commandContainer
+                command:
+                - |-
+                  # ensure that we are not rebuilding binaries and not regenerating code
+                  make .just-build
+                  # make install-schema is needed for a server startup test. See main_test.go
+                  CASSANDRA_HOST=cassandra make install-schema && make cover_profile
+                  ./scripts/buildkite/gen_coverage_metadata.sh .build/coverage/metadata.txt
       - docker-compose#v3.0.0:
           run: unit-test
           config: docker/buildkite/docker-compose.yml