diff --git a/taskcluster/ci/source-test/clang.yml b/taskcluster/ci/source-test/clang.yml
index c26c0d9aaaa4..97cc7151b6f5 100644
--- a/taskcluster/ci/source-test/clang.yml
+++ b/taskcluster/ci/source-test/clang.yml
@@ -107,49 +107,3 @@ external:
             - type: file
               name: public/code-review/clang-tidy.json
               path: /builds/worker/clang-tidy.json
-
-linux64-non-unified:
-    description: Run syntax test for non-unified build on C/C++ files.
-    treeherder:
-        symbol: cpp(non-unified)
-        tier: 1
-    attributes:
-        code-review: false
-    run-on-projects: ['integration']
-    run:
-        cwd: '{checkout}'
-        command: >-
-            source taskcluster/scripts/misc/source-test-clang-setup.sh &&
-            taskcluster/scripts/misc/source-test-clang-non-unified.sh
-    fetches:
-        toolchain:
-            - linux64-clang
-            - linux64-clang-tidy
-            - linux64-rust
-            - sysroot-x86_64-linux-gnu
-            - sysroot-wasm32-wasi
-
-macosx64-non-unified:
-    description: Run syntax test for non-unified build on C/C++ files.
-    platform: osx-cross/debug
-    treeherder:
-        symbol: cpp(non-unified)
-        tier: 1
-    attributes:
-        code-review: false
-    run-on-projects: ['integration']
-    run:
-        cwd: '{checkout}'
-        command: >-
-            source taskcluster/scripts/misc/source-test-clang-setup-macos64.sh &&
-            taskcluster/scripts/misc/source-test-clang-non-unified.sh
-    fetches:
-        toolchain:
-            - linux64-llvm-dsymutil
-            - linux64-rust-macos
-            - linux64-rust-size
-            - linux64-cctools-port
-            - linux64-clang-macosx-cross
-            - macosx64-sdk-10.12
-            - sysroot-x86_64-linux-gnu
-            - sysroot-wasm32-wasi
diff --git a/taskcluster/scripts/misc/source-test-clang-non-unified.sh b/taskcluster/scripts/misc/source-test-clang-non-unified.sh
deleted file mode 100755
index 20a34abd14a8..000000000000
--- a/taskcluster/scripts/misc/source-test-clang-non-unified.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-NON_UNIFIED_CFG=$GECKO_PATH/build/non-unified-compat
-
-cat "$NON_UNIFIED_CFG" | xargs ./mach static-analysis check-syntax