diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
index 38b3d2ab82..e55be2598f 100644
--- a/.github/workflows/integration-tests.yaml
+++ b/.github/workflows/integration-tests.yaml
@@ -91,48 +91,49 @@ jobs:
 #
 #      - name: Run tests
 #        run: make pkg-integration-test IP_FAMILY=${{ inputs.ip-family }} PKG=./pkg/service/repair
+  <<: *additinoal_steps
 
-  small-pkg:
-    name: Test other, smaller packages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
-      - name: Set IP_FAMILY var for all tests
-        run: |
-          echo "IP_FAMILY=${{ inputs.ip-family }}" >> $GITHUB_ENV
-
-      - name: Setup testing dependencies
-        uses: ./.github/actions/test-setup
-        with:
-          scylla-version: ${{ inputs.scylla-version }}
-          ip-family: ${{ inputs.ip-family }}
-          raft-enabled: ${{ inputs.raft-enabled }}
-
-      - name: Run cqlping tests
-        run: make pkg-integration-test PKG=./pkg/ping/cqlping
-
-      - name: Run dynamoping tests
-        run: make pkg-integration-test PKG=./pkg/ping/dynamoping
-
-      - name: Run scyllaclient tests
-        run: make pkg-integration-test PKG=./pkg/scyllaclient
-
-      - name: Run cluster tests
-        run: make pkg-integration-test PKG=./pkg/service/cluster
-
-      - name: Run healthcheck tests
-        run: make pkg-integration-test PKG=./pkg/service/healthcheck
-
-      - name: Run scheduler tests
-        run: make pkg-integration-test PKG=./pkg/service/scheduler
-
-      - name: Run store tests
-        run: make pkg-integration-test PKG=./pkg/store
-
-      - name: Run migrate tests
-        run: make pkg-integration-test PKG=./pkg/schema/migrate
-
-      - name: Run netwait tests
-        run: make pkg-integration-test PKG=./pkg/util/netwait
+#  small-pkg:
+#    name: Test other, smaller packages
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check out code into the Go module directory
+#        uses: actions/checkout@v3
+#
+#      - name: Set IP_FAMILY var for all tests
+#        run: |
+#          echo "IP_FAMILY=${{ inputs.ip-family }}" >> $GITHUB_ENV
+#
+#      - name: Setup testing dependencies
+#        uses: ./.github/actions/test-setup
+#        with:
+#          scylla-version: ${{ inputs.scylla-version }}
+#          ip-family: ${{ inputs.ip-family }}
+#          raft-enabled: ${{ inputs.raft-enabled }}
+#
+#      - name: Run cqlping tests
+#        run: make pkg-integration-test PKG=./pkg/ping/cqlping
+#
+#      - name: Run dynamoping tests
+#        run: make pkg-integration-test PKG=./pkg/ping/dynamoping
+#
+#      - name: Run scyllaclient tests
+#        run: make pkg-integration-test PKG=./pkg/scyllaclient
+#
+#      - name: Run cluster tests
+#        run: make pkg-integration-test PKG=./pkg/service/cluster
+#
+#      - name: Run healthcheck tests
+#        run: make pkg-integration-test PKG=./pkg/service/healthcheck
+#
+#      - name: Run scheduler tests
+#        run: make pkg-integration-test PKG=./pkg/service/scheduler
+#
+#      - name: Run store tests
+#        run: make pkg-integration-test PKG=./pkg/store
+#
+#      - name: Run migrate tests
+#        run: make pkg-integration-test PKG=./pkg/schema/migrate
+#
+#      - name: Run netwait tests
+#        run: make pkg-integration-test PKG=./pkg/util/netwait
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
new file mode 100644
index 0000000000..49682b98ce
--- /dev/null
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,45 @@
+additional_steps: &additional_steps
+  small-pkg:
+    name: Test other, smaller packages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Set IP_FAMILY var for all tests
+        run: |
+          echo "IP_FAMILY=${{ inputs.ip-family }}" >> $GITHUB_ENV
+
+      - name: Setup testing dependencies
+        uses: ./.github/actions/test-setup
+        with:
+          scylla-version: ${{ inputs.scylla-version }}
+          ip-family: ${{ inputs.ip-family }}
+          raft-enabled: ${{ inputs.raft-enabled }}
+
+      - name: Run cqlping tests
+        run: make pkg-integration-test PKG=./pkg/ping/cqlping
+
+      - name: Run dynamoping tests
+        run: make pkg-integration-test PKG=./pkg/ping/dynamoping
+
+      - name: Run scyllaclient tests
+        run: make pkg-integration-test PKG=./pkg/scyllaclient
+
+      - name: Run cluster tests
+        run: make pkg-integration-test PKG=./pkg/service/cluster
+
+      - name: Run healthcheck tests
+        run: make pkg-integration-test PKG=./pkg/service/healthcheck
+
+      - name: Run scheduler tests
+        run: make pkg-integration-test PKG=./pkg/service/scheduler
+
+      - name: Run store tests
+        run: make pkg-integration-test PKG=./pkg/store
+
+      - name: Run migrate tests
+        run: make pkg-integration-test PKG=./pkg/schema/migrate
+
+      - name: Run netwait tests
+        run: make pkg-integration-test PKG=./pkg/util/netwait
\ No newline at end of file