diff --git a/.github/workflows/go.yml b/.github/workflows/test.yml
similarity index 62%
rename from .github/workflows/go.yml
rename to .github/workflows/test.yml
index d3e7d9b966..7560b96d95 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,11 @@
-name: Go
+name: Test SR-IOV Operator
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
 
   build:
@@ -88,3 +92,56 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         path-to-lcov: lcov.out
+
+  virtual-k8s-cluster:
+    name: k8s
+    needs: [
+      build,
+      test,
+      golangci,
+    ]
+    runs-on: [ sriov ]
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Go 1.20
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.x
+
+      - name: run test
+        run: make test-e2e-conformance-virtual-k8s-cluster-ci
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: k8s-artifact
+          path: ./artifacts.tar.gz
+
+  virtual-ocp:
+    name: ocp
+    needs: [
+      build,
+      test,
+      golangci,
+    ]
+
+    runs-on: [ ocp ]
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Go 1.20
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.x
+
+      - name: run test
+        run: make test-e2e-conformance-virtual-ocp-cluster-ci
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: ocp-artifact
+          path: ./artifacts.tar.gz
\ No newline at end of file
diff --git a/.github/workflows/virtual-cluster.yml b/.github/workflows/virtual-cluster.yml
deleted file mode 100644
index 0d288e5c13..0000000000
--- a/.github/workflows/virtual-cluster.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: sriov-operator-test
-on: [pull_request]
-
-jobs:
-  virtual-k8s-cluster:
-    name: k8s
-    runs-on: [sriov]
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Set up Go 1.20
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.20.x
-
-      - name: run test
-        run: make test-e2e-conformance-virtual-k8s-cluster-ci
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: artifact
-          path: ./artifacts.tar.gz
-
-  virtual-ocp:
-    name: ocp
-    runs-on: [ ocp ]
-    steps:
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Set up Go 1.20
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.20.x
-
-      - name: run test
-        run: make test-e2e-conformance-virtual-ocp-cluster-ci
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: artifact
-          path: ./artifacts.tar.gz