diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
index 08c659e..b394480 100644
--- a/.github/workflows/Test.yml
+++ b/.github/workflows/Test.yml
@@ -36,21 +36,3 @@ jobs:
         accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
         command: pages deploy cts_report --project-name=vulkan-driver-cts-report
         gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-      with:
-        toolchain: stable
-        targets: x86_64-unknown-linux-gnu,wasm32-unknown-unknown
-
-    - uses: Swatinem/rust-cache@v2
-      with:
-        cache-all-crates: "true"
-        cache-on-failure: "false"
-
-    - name: Install deqp-runner
-      run: cargo install deqp-runner
-
-    - name: Run multithreaded master Vulkan CTS
-      if: ${{ !cancelled() && steps.install.conclusion == 'success' }}
-      run: zig build test-conformance-multithreaded-soft 
diff --git a/.github/workflows/TestNew.yml b/.github/workflows/TestNew.yml
new file mode 100644
index 0000000..a4363fd
--- /dev/null
+++ b/.github/workflows/TestNew.yml
@@ -0,0 +1,40 @@
+name: Test (new)
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, 'ci skip')"
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: mlugg/setup-zig@v2
+
+    - name: Building
+      run: zig build
+
+    - name: Zig Tests
+      run: zig build test-soft
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        toolchain: stable
+        targets: x86_64-unknown-linux-gnu,wasm32-unknown-unknown
+
+    - uses: Swatinem/rust-cache@v2
+      with:
+        cache-all-crates: "true"
+        cache-on-failure: "false"
+
+    - name: Install deqp-runner
+      run: cargo install deqp-runner
+
+    - name: Run multithreaded master Vulkan CTS
+      run: zig build test-conformance-multithreaded-soft
+      continue-on-error: true