diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dd731a78..d901486c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
           for i in src/parser/cxx/*.cc src/lsp/cxx/lsp/*.cc src/frontend/cxx/*.cc; do
             echo "Parsing $i"
             ./build/src/frontend/cxx \
+              -fno-check \
               -I src/parser \
               -I src/lsp \
               -I build/_deps/utfcpp-src/source \
@@ -52,6 +53,7 @@ jobs:
           for i in src/parser/cxx/*.cc src/lsp/cxx/lsp/*.cc src/frontend/cxx/*.cc; do
             echo "Parsing $i"
             ./build/src/frontend/cxx \
+              -fno-check \
               -toolchain linux \
               -I src/parser \
               -I src/lsp \
@@ -143,7 +145,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          npm ci
+          npm ci --ignore-scripts
 
       - name: Download MLIR
         run: |
@@ -208,6 +210,7 @@ jobs:
           for i in src/parser/cxx/*.cc src/lsp/cxx/lsp/*.cc src/frontend/cxx/*.cc; do
             echo "Parsing $i"
             ./build/src/frontend/cxx \
+              -fno-check \
               -toolchain macos \
               -I src/parser \
               -I src/lsp \
@@ -229,7 +232,7 @@ jobs:
 
       - name: Build
         run: |
-          npm ci
+          npm ci --ignore-scripts
           npm run build:wasi
 
       - name: Install wasmtime
@@ -243,7 +246,7 @@ jobs:
             -W threads=y -S threads=y \
             --dir ${{github.workspace}}/build.wasi/install::/ \
             --dir tests::tests \
-            ${{github.workspace}}/build.wasi/install/usr/bin/cxx.wasm -v tests/manual/source.cc
+            ${{github.workspace}}/build.wasi/install/usr/bin/cxx.wasm -fno-check -v tests/manual/source.cc
 
       - name: Parse C++ source files (wasmtime runtime)
         run: |
@@ -259,6 +262,7 @@ jobs:
                   --dir=build.wasi/src/lsp::build.wasi/src/lsp \
                   --dir=build.wasi/install/usr::/usr \
                   build.wasi/install/usr/bin/cxx.wasm \
+              -fno-check \
               -I src/parser \
               -I src/lsp \
               -I build.wasi/_deps/utfcpp-src/source \
@@ -297,7 +301,7 @@ jobs:
 
       - name: Build
         run: |
-          npm ci
+          npm ci --ignore-scripts
           npm run build -w @robertoraggi/cxx-playground -- --base /cplusplus
           mkdir -p packages/cxx-playground/dist/docs
           cp -a packages/cxx-frontend/docs/. packages/cxx-playground/dist/docs
diff --git a/.github/workflows/mlir.yaml b/.github/workflows/mlir.yaml
index fd0e50a7..6c10a459 100644
--- a/.github/workflows/mlir.yaml
+++ b/.github/workflows/mlir.yaml
@@ -17,7 +17,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          npm ci
+          npm ci --ignore-scripts
 
       - name: Build
         run: |
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8fed9d27..b87c74c2 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Build
         run: |
-          npm ci
+          npm ci --ignore-scripts
           npm -w cxx-frontend run build
 
       - name: Publish
diff --git a/README.md b/README.md
index da0b7681..be75b7dd 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ uv sync && source .venv/bin/activate
 configure the source code
 
 ```sh
-cmake --preset default
+cmake --preset default-mlir -DCMAKE_PREFIX_PATH=<path to llvm>
 ```
 
 build
@@ -54,10 +54,10 @@ cd build
 ctest --progress
 ```
 
-Dump the AST to stdout
+Disable the type checker and dump the AST to stdout
 
 ```sh
- ./build/src/frontend/cxx tests/manual/source.cc -ast-dump
+ ./build/src/frontend/cxx -fno-check -ast-dump tests/manual/source.cc
 ```
 
 ## Build the npm package (requires docker)
@@ -71,13 +71,15 @@ npm ci
 compile WASM and TypeScript code
 
 ```sh
+npm ci --ignore-scripts
+npm run download-mlir # requires gh cli tool
 npm run build:cxx-frontend
 ```
 
 ## Build for WASM/WASI (requires docker)
 
 ```sh
-npm ci
+npm ci --ignore-scripts
 npm run build:wasi
 ```
 
diff --git a/package-lock.json b/package-lock.json
index bcbe71e8..d6d0122e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "packages/*"
       ],
       "devDependencies": {
-        "@types/node": "^25.5.0",
+        "@types/node": "^25.5.2",
         "jsonc-parser": "^3.3.1",
         "zx": "^8.8.5"
       }
@@ -516,9 +516,9 @@
       }
     },
     "node_modules/@dotenvx/dotenvx": {
-      "version": "1.57.2",
-      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.57.2.tgz",
-      "integrity": "sha512-lv9+UZPnl/KOvShepevLWm3+/wc1It5kgO5Q580evnvOFMZcgKVEYFwxlL7Ohl9my1yjTsWo28N3PJYUEO8wFQ==",
+      "version": "1.60.2",
+      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.60.2.tgz",
+      "integrity": "sha512-r4AznHUvfLONuWdoSIQtut6Ez/ym+lGXRtDvRaoAEMEhAmwSoK24jRsfR28vcb3ygWm7qeYOcbZolhtseJl6mA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -530,7 +530,8 @@
         "ignore": "^5.3.0",
         "object-treeify": "1.1.33",
         "picomatch": "^4.0.2",
-        "which": "^4.0.0"
+        "which": "^4.0.0",
+        "yocto-spinner": "^1.1.0"
       },
       "bin": {
         "dotenvx": "src/cli/dotenvx.js"
@@ -682,14 +683,14 @@
       }
     },
     "node_modules/@ecies/ciphers": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@ecies/ciphers/-/ciphers-0.2.5.tgz",
-      "integrity": "sha512-GalEZH4JgOMHYYcYmVqnFirFsjZHeoGMDt9IxEnM9F7GRUUyUksJ7Ou53L83WHJq3RWKD3AcBpo0iQh0oMpf8A==",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@ecies/ciphers/-/ciphers-0.2.6.tgz",
+      "integrity": "sha512-patgsRPKGkhhoBjETV4XxD0En4ui5fbX0hzayqI3M8tvNMGUoUvmyYAIWwlxBc1KX5cturfqByYdj5bYGRpN9g==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "bun": ">=1",
-        "deno": ">=2",
+        "deno": ">=2.7.10",
         "node": ">=16"
       },
       "peerDependencies": {
@@ -962,9 +963,9 @@
       }
     },
     "node_modules/@hono/node-server": {
-      "version": "1.19.11",
-      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.11.tgz",
-      "integrity": "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==",
+      "version": "1.19.13",
+      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.13.tgz",
+      "integrity": "sha512-TsQLe4i2gvoTtrHje625ngThGBySOgSK3Xo2XRYOdqGN1teR8+I7vchQC46uLJi8OF62YTYA3AhSpumtkhsaKQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1165,9 +1166,9 @@
       }
     },
     "node_modules/@modelcontextprotocol/sdk": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.28.0.tgz",
-      "integrity": "sha512-gmloF+i+flI8ouQK7MWW4mOwuMh4RePBuPFAEPC6+pdqyWOUMDOixb6qZ69owLJpz6XmyllCouc4t8YWO+E2Nw==",
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
+      "integrity": "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1248,20 +1249,22 @@
       }
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.1.tgz",
-      "integrity": "sha512-p64ah1M1ld8xjWv3qbvFwHiFVWrq1yFvV4f7w+mzaqiR4IlSgkqhcRdHwsGgomwzBH51sRY4NEowLxnaBjcW/A==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.3.tgz",
+      "integrity": "sha512-xK9sGVbJWYb08+mTJt3/YV24WxvxpXcXtP6B172paPZ+Ts69Re9dAr7lKwJoeIx8OoeuimEiRZ7umkiUVClmmQ==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.7.1",
-        "@emnapi/runtime": "^1.7.1",
         "@tybys/wasm-util": "^0.10.1"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "peerDependencies": {
+        "@emnapi/core": "^1.7.1",
+        "@emnapi/runtime": "^1.7.1"
       }
     },
     "node_modules/@noble/ciphers": {
@@ -1370,9 +1373,9 @@
       "license": "MIT"
     },
     "node_modules/@oxc-project/types": {
-      "version": "0.122.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.122.0.tgz",
-      "integrity": "sha512-oLAl5kBpV4w69UtFZ9xqcmTi+GENWOcPF7FCrczTiBbmC0ibXxCwyvZGbO39rCVEuLGAZM84DH0pUIyyv/YJzA==",
+      "version": "0.123.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.123.0.tgz",
+      "integrity": "sha512-YtECP/y8Mj1lSHiUWGSRzy/C6teUKlS87dEfuVKT09LgQbUsBW1rNg+MiJ4buGu3yuADV60gbIvo9/HplA56Ew==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -1392,9 +1395,9 @@
       "link": true
     },
     "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-pv1y2Fv0JybcykuiiD3qBOBdz6RteYojRFY1d+b95WVuzx211CRh+ytI/+9iVyWQ6koTh5dawe4S/yRfOFjgaA==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.13.tgz",
+      "integrity": "sha512-5ZiiecKH2DXAVJTNN13gNMUcCDg4Jy8ZjbXEsPnqa248wgOVeYRX0iqXXD5Jz4bI9BFHgKsI2qmyJynstbmr+g==",
       "cpu": [
         "arm64"
       ],
@@ -1409,9 +1412,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-cFYr6zTG/3PXXF3pUO+umXxt1wkRK/0AYT8lDwuqvRC+LuKYWSAQAQZjCWDQpAH172ZV6ieYrNnFzVVcnSflAg==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.13.tgz",
+      "integrity": "sha512-tz/v/8G77seu8zAB3A5sK3UFoOl06zcshEzhUO62sAEtrEuW/H1CcyoupOrD+NbQJytYgA4CppXPzlrmp4JZKA==",
       "cpu": [
         "arm64"
       ],
@@ -1426,9 +1429,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-ZCsYknnHzeXYps0lGBz8JrF37GpE9bFVefrlmDrAQhOEi4IOIlcoU1+FwHEtyXGx2VkYAvhu7dyBf75EJQffBw==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.13.tgz",
+      "integrity": "sha512-8DakphqOz8JrMYWTJmWA+vDJxut6LijZ8Xcdc4flOlAhU7PNVwo2MaWBF9iXjJAPo5rC/IxEFZDhJ3GC7NHvug==",
       "cpu": [
         "x64"
       ],
@@ -1443,9 +1446,9 @@
       }
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-dMLeprcVsyJsKolRXyoTH3NL6qtsT0Y2xeuEA8WQJquWFXkEC4bcu1rLZZSnZRMtAqwtrF/Ib9Ddtpa/Gkge9Q==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.13.tgz",
+      "integrity": "sha512-4wBQFfjDuXYN/SVI8inBF3Aa+isq40rc6VMFbk5jcpolUBTe5cYnMsHZ51nFWsx3PVyyNN3vgoESki0Hmr/4BA==",
       "cpu": [
         "x64"
       ],
@@ -1460,9 +1463,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.12.tgz",
-      "integrity": "sha512-YqWjAgGC/9M1lz3GR1r1rP79nMgo3mQiiA+Hfo+pvKFK1fAJ1bCi0ZQVh8noOqNacuY1qIcfyVfP6HoyBRZ85Q==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.13.tgz",
+      "integrity": "sha512-JW/e4yPIXLms+jmnbwwy5LA/LxVwZUWLN8xug+V200wzaVi5TEGIWQlh8o91gWYFxW609euI98OCCemmWGuPrw==",
       "cpu": [
         "arm"
       ],
@@ -1477,9 +1480,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-/I5AS4cIroLpslsmzXfwbe5OmWvSsrFuEw3mwvbQ1kDxJ822hFHIx+vsN/TAzNVyepI/j/GSzrtCIwQPeKCLIg==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.13.tgz",
+      "integrity": "sha512-ZfKWpXiUymDnavepCaM6KG/uGydJ4l2nBmMxg60Ci4CbeefpqjPWpfaZM7PThOhk2dssqBAcwLc6rAyr0uTdXg==",
       "cpu": [
         "arm64"
       ],
@@ -1497,9 +1500,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.12.tgz",
-      "integrity": "sha512-V6/wZztnBqlx5hJQqNWwFdxIKN0m38p8Jas+VoSfgH54HSj9tKTt1dZvG6JRHcjh6D7TvrJPWFGaY9UBVOaWPw==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.13.tgz",
+      "integrity": "sha512-bmRg3O6Z0gq9yodKKWCIpnlH051sEfdVwt+6m5UDffAQMUUqU0xjnQqqAUm+Gu7ofAAly9DqiQDtKu2nPDEABA==",
       "cpu": [
         "arm64"
       ],
@@ -1517,9 +1520,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-AP3E9BpcUYliZCxa3w5Kwj9OtEVDYK6sVoUzy4vTOJsjPOgdaJZKFmN4oOlX0Wp0RPV2ETfmIra9x1xuayFB7g==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.0-rc.13.tgz",
+      "integrity": "sha512-8Wtnbw4k7pMYN9B/mOEAsQ8HOiq7AZ31Ig4M9BKn2So4xRaFEhtCSa4ZJaOutOWq50zpgR4N5+L/opnlaCx8wQ==",
       "cpu": [
         "ppc64"
       ],
@@ -1537,9 +1540,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-nWwpvUSPkoFmZo0kQazZYOrT7J5DGOJ/+QHHzjvNlooDZED8oH82Yg67HvehPPLAg5fUff7TfWFHQS8IV1n3og==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.0-rc.13.tgz",
+      "integrity": "sha512-D/0Nlo8mQuxSMohNJUF2lDXWRsFDsHldfRRgD9bRgktj+EndGPj4DOV37LqDKPYS+osdyhZEH7fTakTAEcW7qg==",
       "cpu": [
         "s390x"
       ],
@@ -1557,9 +1560,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.12.tgz",
-      "integrity": "sha512-RNrafz5bcwRy+O9e6P8Z/OCAJW/A+qtBczIqVYwTs14pf4iV1/+eKEjdOUta93q2TsT/FI0XYDP3TCky38LMAg==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.13.tgz",
+      "integrity": "sha512-eRrPvat2YaVQcwwKi/JzOP6MKf1WRnOCr+VaI3cTWz3ZoLcP/654z90lVCJ4dAuMEpPdke0n+qyAqXDZdIC4rA==",
       "cpu": [
         "x64"
       ],
@@ -1577,9 +1580,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.12.tgz",
-      "integrity": "sha512-Jpw/0iwoKWx3LJ2rc1yjFrj+T7iHZn2JDg1Yny1ma0luviFS4mhAIcd1LFNxK3EYu3DHWCps0ydXQ5i/rrJ2ig==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.13.tgz",
+      "integrity": "sha512-PsdONiFRp8hR8KgVjTWjZ9s7uA3uueWL0t74/cKHfM4dR5zXYv4AjB8BvA+QDToqxAFg4ZkcVEqeu5F7inoz5w==",
       "cpu": [
         "x64"
       ],
@@ -1597,9 +1600,9 @@
       }
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.12.tgz",
-      "integrity": "sha512-vRugONE4yMfVn0+7lUKdKvN4D5YusEiPilaoO2sgUWpCvrncvWgPMzK00ZFFJuiPgLwgFNP5eSiUlv2tfc+lpA==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.13.tgz",
+      "integrity": "sha512-hCNXgC5dI3TVOLrPT++PKFNZ+1EtS0mLQwfXXXSUD/+rGlB65gZDwN/IDuxLpQP4x8RYYHqGomlUXzpO8aVI2w==",
       "cpu": [
         "arm64"
       ],
@@ -1614,9 +1617,9 @@
       }
     },
     "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.12.tgz",
-      "integrity": "sha512-ykGiLr/6kkiHc0XnBfmFJuCjr5ZYKKofkx+chJWDjitX+KsJuAmrzWhwyOMSHzPhzOHOy7u9HlFoa5MoAOJ/Zg==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.13.tgz",
+      "integrity": "sha512-viLS5C5et8NFtLWw9Sw3M/w4vvnVkbWkO7wSNh3C+7G1+uCkGpr6PcjNDSFcNtmXY/4trjPBqUfcOL+P3sWy/g==",
       "cpu": [
         "wasm32"
       ],
@@ -1624,16 +1627,18 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@napi-rs/wasm-runtime": "^1.1.1"
+        "@emnapi/core": "1.9.1",
+        "@emnapi/runtime": "1.9.1",
+        "@napi-rs/wasm-runtime": "^1.1.2"
       },
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.12.tgz",
-      "integrity": "sha512-5eOND4duWkwx1AzCxadcOrNeighiLwMInEADT0YM7xeEOOFcovWZCq8dadXgcRHSf3Ulh1kFo/qvzoFiCLOL1Q==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.13.tgz",
+      "integrity": "sha512-Fqa3Tlt1xL4wzmAYxGNFV36Hb+VfPc9PYU+E25DAnswXv3ODDu/yyWjQDbXMo5AGWkQVjLgQExuVu8I/UaZhPQ==",
       "cpu": [
         "arm64"
       ],
@@ -1648,9 +1653,9 @@
       }
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.12.tgz",
-      "integrity": "sha512-PyqoipaswDLAZtot351MLhrlrh6lcZPo2LSYE+VDxbVk24LVKAGOuE4hb8xZQmrPAuEtTZW8E6D2zc5EUZX4Lw==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.13.tgz",
+      "integrity": "sha512-/pLI5kPkGEi44TDlnbio3St/5gUFeN51YWNAk/Gnv6mEQBOahRBh52qVFVBpmrnU01n2yysvBML9Ynu7K4kGAQ==",
       "cpu": [
         "x64"
       ],
@@ -1665,9 +1670,9 @@
       }
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.12.tgz",
-      "integrity": "sha512-HHMwmarRKvoFsJorqYlFeFRzXZqCt2ETQlEDOb9aqssrnVBB1/+xgTGtuTrIk5vzLNX1MjMtTf7W9z3tsSbrxw==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.13.tgz",
+      "integrity": "sha512-3ngTAv6F/Py35BsYbeeLeecvhMKdsKm4AoOETVhAA+Qc8nrA2I0kF7oa93mE9qnIurngOSpMnQ0x2nQY2FPviA==",
       "dev": true,
       "license": "MIT"
     },
@@ -2025,9 +2030,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.95.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.95.2.tgz",
-      "integrity": "sha512-o4T8vZHZET4Bib3jZ/tCW9/7080urD4c+0/AUaYVpIqOsr7y0reBc1oX3ttNaSW5mYyvZHctiQ/UOP2PfdmFEQ==",
+      "version": "5.96.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.96.2.tgz",
+      "integrity": "sha512-hzI6cTVh4KNRk8UtoIBS7Lv9g6BnJPXvBKsvYH1aGWvv0347jT3BnSvztOE+kD76XGvZnRC/t6qdW1CaIfwCeA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -2036,13 +2041,13 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.95.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.95.2.tgz",
-      "integrity": "sha512-/wGkvLj/st5Ud1Q76KF1uFxScV7WeqN1slQx5280ycwAyYkIPGaRZAEgHxe3bjirSd5Zpwkj6zNcR4cqYni/ZA==",
+      "version": "5.96.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.96.2.tgz",
+      "integrity": "sha512-sYyzzJT4G0g02azzJ8o55VFFV31XvFpdUpG+unxS0vSaYsJnSPKGoI6WdPwUucJL1wpgGfwfmntNX/Ub1uOViA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.95.2"
+        "@tanstack/query-core": "5.96.2"
       },
       "funding": {
         "type": "github",
@@ -2088,13 +2093,13 @@
       }
     },
     "node_modules/@ts-morph/common/node_modules/minimatch": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^5.0.2"
+        "brace-expansion": "^5.0.5"
       },
       "engines": {
         "node": "18 || 20 || >=22"
@@ -2139,9 +2144,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "25.5.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz",
-      "integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==",
+      "version": "25.5.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.2.tgz",
+      "integrity": "sha512-tO4ZIRKNC+MDWV4qKVZe3Ql/woTnmHDr5JD8UI5hn2pwBrHEwOEMZK7WlNb5RKB6EoJ02gwmQS9OrjuFnZYdpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2378,9 +2383,9 @@
       "peer": true
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.10.11",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.11.tgz",
-      "integrity": "sha512-DAKrHphkJyiGuau/cFieRYhcTFeK/lBuD++C7cZ6KZHbMhBrisoi+EvhQ5RZrIfV5qwsW8kgQ07JIC+MDJRAhg==",
+      "version": "2.10.16",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.16.tgz",
+      "integrity": "sha512-Lyf3aK28zpsD1yQMiiHD4RvVb6UdMoo8xzG2XzFIfR9luPzOpcBlAsT/qfB1XWS1bxWT+UtE4WmQgsp297FYOA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -2426,9 +2431,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
+      "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -2451,9 +2456,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.28.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
-      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
+      "version": "4.28.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
+      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
       "dev": true,
       "funding": [
         {
@@ -2471,11 +2476,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.9.0",
-        "caniuse-lite": "^1.0.30001759",
-        "electron-to-chromium": "^1.5.263",
-        "node-releases": "^2.0.27",
-        "update-browserslist-db": "^1.2.0"
+        "baseline-browser-mapping": "^2.10.12",
+        "caniuse-lite": "^1.0.30001782",
+        "electron-to-chromium": "^1.5.328",
+        "node-releases": "^2.0.36",
+        "update-browserslist-db": "^1.2.3"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2552,9 +2557,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001781",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001781.tgz",
-      "integrity": "sha512-RdwNCyMsNBftLjW6w01z8bKEvT6e/5tpPVEgtn22TiLGlstHOVecsX2KHFkD5e/vRnIE4EGzpuIODb3mtswtkw==",
+      "version": "1.0.30001787",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001787.tgz",
+      "integrity": "sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==",
       "dev": true,
       "funding": [
         {
@@ -2744,9 +2749,9 @@
       "peer": true
     },
     "node_modules/content-disposition": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.0.1.tgz",
-      "integrity": "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-1.1.0.tgz",
+      "integrity": "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3022,9 +3027,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "17.3.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz",
-      "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==",
+      "version": "17.4.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.1.tgz",
+      "integrity": "sha512-k8DaKGP6r1G30Lx8V4+pCsLzKr8vLmV2paqEj1Y55GdAgJuIqpRp5FfajGF8KtwMxCz9qJc6wUIJnm053d/WCw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -3075,9 +3080,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.325",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.325.tgz",
-      "integrity": "sha512-PwfIw7WQSt3xX7yOf5OE/unLzsK9CaN2f/FvV3WjPR1Knoc1T9vePRVV4W1EM301JzzysK51K7FNKcusCr0zYA==",
+      "version": "1.5.334",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.334.tgz",
+      "integrity": "sha512-mgjZAz7Jyx1SRCwEpy9wefDS7GvNPazLthHg8eQMJ76wBdGQQDW33TCrUTvQ4wzpmOrv2zrFoD3oNufMdyMpog==",
       "dev": true,
       "license": "ISC"
     },
@@ -3515,9 +3520,9 @@
       }
     },
     "node_modules/express-rate-limit": {
-      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.3.1.tgz",
-      "integrity": "sha512-D1dKN+cmyPWuvB+G2SREQDzPY1agpBIcTa9sJxOPMCNeH3gwzhqJRDWCXW3gg0y//+LQ/8j52JbMROWyrKdMdw==",
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.3.2.tgz",
+      "integrity": "sha512-77VmFeJkO0/rvimEDuUC5H30oqUC4EyOhyGccfqoLebB0oiEYfM7nwPrsDsBL1gsTpwfzX8SFy2MT3TDyRq+bg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4055,9 +4060,9 @@
       }
     },
     "node_modules/hono": {
-      "version": "4.12.9",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.9.tgz",
-      "integrity": "sha512-wy3T8Zm2bsEvxKZM5w21VdHDDcwVS1yUFFY6i8UobSsKfFceT7TOwhbhfKsDyx7tYQlmRM5FLpIuYvNFyjctiA==",
+      "version": "4.12.12",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.12.tgz",
+      "integrity": "sha512-p1JfQMKaceuCbpJKAPKVqyqviZdS0eUxH9v82oWo1kb9xjQ5wA6iP3FNVAPDFlz5/p7d45lO+BpSk1tuSZMF4Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5160,9 +5165,9 @@
       "license": "MIT"
     },
     "node_modules/msw": {
-      "version": "2.12.14",
-      "resolved": "https://registry.npmjs.org/msw/-/msw-2.12.14.tgz",
-      "integrity": "sha512-4KXa4nVBIBjbDbd7vfQNuQ25eFxug0aropCQFoI0JdOBuJWamkT1yLVIWReFI8SiTRc+H1hKzaNk+cLk2N9rtQ==",
+      "version": "2.13.2",
+      "resolved": "https://registry.npmjs.org/msw/-/msw-2.13.2.tgz",
+      "integrity": "sha512-go2H1TIERKkC48pXiwec5l6sbNqYuvqOk3/vHGo1Zd+pq/H63oFawDQerH+WQdUw/flJFHDG7F+QdWMwhntA/A==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -5412,9 +5417,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.36",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.36.tgz",
-      "integrity": "sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==",
+      "version": "2.0.37",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.37.tgz",
+      "integrity": "sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==",
       "dev": true,
       "license": "MIT"
     },
@@ -5755,9 +5760,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.8",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
-      "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
+      "version": "8.5.9",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.9.tgz",
+      "integrity": "sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==",
       "dev": true,
       "funding": [
         {
@@ -5974,9 +5979,9 @@
       }
     },
     "node_modules/react": {
-      "version": "19.2.4",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
-      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
+      "version": "19.2.5",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.5.tgz",
+      "integrity": "sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5984,16 +5989,16 @@
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.4",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
-      "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
+      "version": "19.2.5",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.5.tgz",
+      "integrity": "sha512-J5bAZz+DXMMwW/wV3xzKke59Af6CHY7G4uYLN1OvBcKEsWOs4pQExj86BBKamxl/Ik5bx9whOrvBlSDfWzgSag==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.4"
+        "react": "^19.2.5"
       }
     },
     "node_modules/react-window": {
@@ -6097,14 +6102,14 @@
       }
     },
     "node_modules/rolldown": {
-      "version": "1.0.0-rc.12",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.12.tgz",
-      "integrity": "sha512-yP4USLIMYrwpPHEFB5JGH1uxhcslv6/hL0OyvTuY+3qlOSJvZ7ntYnoWpehBxufkgN0cvXxppuTu5hHa/zPh+A==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.13.tgz",
+      "integrity": "sha512-bvVj8YJmf0rq4pSFmH7laLa6pYrhghv3PRzrCdRAr23g66zOKVJ4wkvFtgohtPLWmthgg8/rkaqRHrpUEh0Zbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@oxc-project/types": "=0.122.0",
-        "@rolldown/pluginutils": "1.0.0-rc.12"
+        "@oxc-project/types": "=0.123.0",
+        "@rolldown/pluginutils": "1.0.0-rc.13"
       },
       "bin": {
         "rolldown": "bin/cli.mjs"
@@ -6113,21 +6118,21 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.0.0-rc.12",
-        "@rolldown/binding-darwin-arm64": "1.0.0-rc.12",
-        "@rolldown/binding-darwin-x64": "1.0.0-rc.12",
-        "@rolldown/binding-freebsd-x64": "1.0.0-rc.12",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.12",
-        "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.12",
-        "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.12",
-        "@rolldown/binding-linux-x64-musl": "1.0.0-rc.12",
-        "@rolldown/binding-openharmony-arm64": "1.0.0-rc.12",
-        "@rolldown/binding-wasm32-wasi": "1.0.0-rc.12",
-        "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.12",
-        "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.12"
+        "@rolldown/binding-android-arm64": "1.0.0-rc.13",
+        "@rolldown/binding-darwin-arm64": "1.0.0-rc.13",
+        "@rolldown/binding-darwin-x64": "1.0.0-rc.13",
+        "@rolldown/binding-freebsd-x64": "1.0.0-rc.13",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.13",
+        "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.13",
+        "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.13",
+        "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.13",
+        "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.13",
+        "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.13",
+        "@rolldown/binding-linux-x64-musl": "1.0.0-rc.13",
+        "@rolldown/binding-openharmony-arm64": "1.0.0-rc.13",
+        "@rolldown/binding-wasm32-wasi": "1.0.0-rc.13",
+        "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.13",
+        "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.13"
       }
     },
     "node_modules/router": {
@@ -6148,9 +6153,9 @@
       }
     },
     "node_modules/router/node_modules/path-to-regexp": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
-      "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
+      "integrity": "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -6274,9 +6279,9 @@
       "license": "ISC"
     },
     "node_modules/shadcn": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/shadcn/-/shadcn-4.1.0.tgz",
-      "integrity": "sha512-3zETJ+0Ezj69FS6RL0HOkLKKAR5yXisXx1iISJdfLQfrUqj/VIQlanQi1Ukk+9OE+XHZVj4FQNTBSfbr2CyCYg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/shadcn/-/shadcn-4.2.0.tgz",
+      "integrity": "sha512-ZDuV340itidaUd4Gi1BxQX+Y7Ush6BHp6URZBM2RyxUUBZ6yFtOWIr4nVY+Ro+YRSpo82v7JrsmtcU5xoBCMJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6373,14 +6378,14 @@
       }
     },
     "node_modules/side-channel-list": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
-      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz",
+      "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
-        "object-inspect": "^1.13.3"
+        "object-inspect": "^1.13.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6661,14 +6666,14 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.15",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
-      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "version": "0.2.16",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.16.tgz",
+      "integrity": "sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.5.0",
-        "picomatch": "^4.0.3"
+        "picomatch": "^4.0.4"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -6678,22 +6683,22 @@
       }
     },
     "node_modules/tldts": {
-      "version": "7.0.27",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.27.tgz",
-      "integrity": "sha512-I4FZcVFcqCRuT0ph6dCDpPuO4Xgzvh+spkcTr1gK7peIvxWauoloVO0vuy1FQnijT63ss6AsHB6+OIM4aXHbPg==",
+      "version": "7.0.28",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.28.tgz",
+      "integrity": "sha512-+Zg3vWhRUv8B1maGSTFdev9mjoo8Etn2Ayfs4cnjlD3CsGkxXX4QyW3j2WJ0wdjYcYmy7Lx2RDsZMhgCWafKIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^7.0.27"
+        "tldts-core": "^7.0.28"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "7.0.27",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.27.tgz",
-      "integrity": "sha512-YQ7uPjgWUibIK6DW5lrKujGwUKhLevU4hcGbP5O6TcIUb+oTjJYJVWPS4nZsIHrEEEG6myk/oqAJUEQmpZrHsg==",
+      "version": "7.0.28",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.28.tgz",
+      "integrity": "sha512-7W5Efjhsc3chVdFhqtaU0KtK32J37Zcr9RKtID54nG+tIpcY79CQK/veYPODxtD/LJ4Lue66jvrQzIX2Z2/pUQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -6868,13 +6873,13 @@
       }
     },
     "node_modules/typedoc/node_modules/minimatch": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^5.0.2"
+        "brace-expansion": "^5.0.5"
       },
       "engines": {
         "node": "18 || 20 || >=22"
@@ -6996,9 +7001,9 @@
       }
     },
     "node_modules/use-debounce": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-10.1.0.tgz",
-      "integrity": "sha512-lu87Za35V3n/MyMoEpD5zJv0k7hCn0p+V/fK2kWD+3k2u3kOCwO593UArbczg1fhfs2rqPEnHpULJ3KmGdDzvg==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/use-debounce/-/use-debounce-10.1.1.tgz",
+      "integrity": "sha512-kvds8BHR2k28cFsxW8k3nc/tRga2rs1RHYCqmmGqb90MEeE++oALwzh2COiuBLO1/QXiOuShXoSN2ZpWnMmvuQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7046,16 +7051,16 @@
       }
     },
     "node_modules/vite": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.3.tgz",
-      "integrity": "sha512-B9ifbFudT1TFhfltfaIPgjo9Z3mDynBTJSUYxTjOQruf/zHH+ezCQKcoqO+h7a9Pw9Nm/OtlXAiGT1axBgwqrQ==",
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.7.tgz",
+      "integrity": "sha512-P1PbweD+2/udplnThz3btF4cf6AgPky7kk23RtHUkJIU5BIxwPprhRGmOAHs6FTI7UiGbTNrgNP6jSYD6JaRnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "lightningcss": "^1.32.0",
         "picomatch": "^4.0.4",
         "postcss": "^8.5.8",
-        "rolldown": "1.0.0-rc.12",
+        "rolldown": "1.0.0-rc.13",
         "tinyglobby": "^0.2.15"
       },
       "bin": {
@@ -7073,7 +7078,7 @@
       "peerDependencies": {
         "@types/node": "^20.19.0 || >=22.12.0",
         "@vitejs/devtools": "^0.1.0",
-        "esbuild": "^0.27.0",
+        "esbuild": "^0.27.0 || ^0.28.0",
         "jiti": ">=1.21.0",
         "less": "^4.0.0",
         "sass": "^1.70.0",
@@ -7317,6 +7322,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/yocto-spinner": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-spinner/-/yocto-spinner-1.1.0.tgz",
+      "integrity": "sha512-/BY0AUXnS7IKO354uLLA2eRcWiqDifEbd6unXCsOxkFDAkhgUL3PH9X2bFoaU0YchnDXsF+iKleeTLJGckbXfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yoctocolors": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=18.19"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/yoctocolors": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.2.tgz",
@@ -7354,13 +7375,13 @@
       }
     },
     "node_modules/zod-to-json-schema": {
-      "version": "3.25.1",
-      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz",
-      "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==",
+      "version": "3.25.2",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz",
+      "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==",
       "dev": true,
       "license": "ISC",
       "peerDependencies": {
-        "zod": "^3.25 || ^4"
+        "zod": "^3.25.28 || ^4"
       }
     },
     "node_modules/zod-validation-error": {
diff --git a/package.json b/package.json
index 1912941b..e765bd76 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "url": "https://github.com/robertoraggi/cplusplus/issues"
   },
   "devDependencies": {
-    "@types/node": "^25.5.0",
+    "@types/node": "^25.5.2",
     "jsonc-parser": "^3.3.1",
     "zx": "^8.8.5"
   },
diff --git a/packages/cxx-frontend/package.json b/packages/cxx-frontend/package.json
index a8272a44..b0af9db8 100644
--- a/packages/cxx-frontend/package.json
+++ b/packages/cxx-frontend/package.json
@@ -7,7 +7,7 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
-    "./wasm": "./dist/wasm/cxx-js.wasm"
+    "./wasm": "./dist/cxx-js.wasm"
   },
   "types": "dist/index.d.ts",
   "type": "module",
diff --git a/scripts/build-emscripten.js b/scripts/build-emscripten.js
index 3319c19a..3b903221 100644
--- a/scripts/build-emscripten.js
+++ b/scripts/build-emscripten.js
@@ -9,7 +9,7 @@ const __dirname = path.dirname(__filename);
 
 async function main() {
   // configure cmake using the emscripten presets
-  await $`cmake --preset emscripten`;
+  await $`cmake --preset emscripten-mlir`;
   await $`cmake --build --preset build-emscripten`;
 
   // make sure packages/cxx-frontend/dist/wasm exists
@@ -22,7 +22,7 @@ async function main() {
   await $`cp build.em/src/js/cxx-js.js ${path.join(__dirname, "../packages/cxx-frontend/dist/")}`;
 
   // copy build.em/src/js/cxx-js.wasm to packages/cxx-frontend/dist/wasm
-  await $`cp build.em/src/js/cxx-js.wasm ${path.join(__dirname, "../packages/cxx-frontend/dist/wasm/")}`;
+  await $`cp build.em/src/js/cxx-js.wasm ${path.join(__dirname, "../packages/cxx-frontend/dist/")}`;
 }
 
 await main();
diff --git a/src/frontend/cxx/cxx.cc b/src/frontend/cxx/cxx.cc
index 0391e604..a2fde1ca 100644
--- a/src/frontend/cxx/cxx.cc
+++ b/src/frontend/cxx/cxx.cc
@@ -39,6 +39,11 @@ auto main(int argc, char* argv[]) -> int {
     cli.opt_lsp = true;
   }
 
+  if (cli.opt_fno_check) {
+    cli.opt_fcheck = false;
+    cli.opt_fsyntax_only = true;
+  }
+
   if (!cli.opt_lsp && inputFiles.empty()) {
     std::cerr << "cxx: no input files" << std::endl
               << "Usage: cxx [options] file..." << std::endl;
diff --git a/src/frontend/cxx/frontend.cc b/src/frontend/cxx/frontend.cc
index 79d2def8..b07d1200 100644
--- a/src/frontend/cxx/frontend.cc
+++ b/src/frontend/cxx/frontend.cc
@@ -524,8 +524,7 @@ void Frontend::Private::parse() {
   }
 
   unit_->parse(ParserConfiguration{
-      .checkTypes =
-          cli.opt_fcheck || needsIR() || unit_->language() == LanguageKind::kC,
+      .checkTypes = cli.opt_fcheck,
       .fuzzyTemplateResolution = true,
       .allowUnprototypedFunctions = cli.opt_fno_strict_prototypes,
       .stopParsingPredicate = [this]() -> bool {
diff --git a/src/js/CMakeLists.txt b/src/js/CMakeLists.txt
index ea3e6b33..d03c66ff 100644
--- a/src/js/CMakeLists.txt
+++ b/src/js/CMakeLists.txt
@@ -32,17 +32,11 @@ if (CXX_ENABLE_MLIR)
 endif()
 
 target_link_options(cxx-js PUBLIC
-    "SHELL:-s ENVIRONMENT=web"
-    "SHELL:-s MINIMAL_RUNTIME"
     "SHELL:-s EXPORT_ES6=1"
-    "SHELL:-s WASM_ASYNC_COMPILATION=1"
     "SHELL:-s MODULARIZE=1"
     "SHELL:-s MALLOC=emmalloc"
     "SHELL:-s ALLOW_MEMORY_GROWTH=1"
-    "SHELL:-s FILESYSTEM=0"
-    "SHELL:-s NO_DYNAMIC_EXECUTION=1"
     "SHELL:-s WASM_BIGINT=1"
-    "SHELL:-s INCOMING_MODULE_JS_API=[]"
     "SHELL:-s POLYFILL=0"
 )
 
diff --git a/src/js/cxx/api.cc b/src/js/cxx/api.cc
index 9541bf68..6811dd2d 100644
--- a/src/js/cxx/api.cc
+++ b/src/js/cxx/api.cc
@@ -32,14 +32,14 @@
 #include <emscripten/val.h>
 
 #include <cstdlib>
-#include <format>
-#include <iostream>
 #include <optional>
 #include <sstream>
 
 #ifdef CXX_WITH_MLIR
 #include <cxx/mlir/codegen.h>
 #include <cxx/mlir/cxx_dialect.h>
+#include <cxx/mlir/cxx_dialect_conversions.h>
+#include <cxx/wasm32_wasi_toolchain.h>
 #include <llvm/Support/raw_os_ostream.h>
 #include <mlir/IR/MLIRContext.h>
 #endif
@@ -72,6 +72,9 @@ struct WrappedUnit {
   std::unique_ptr<DiagnosticsClient> diagnosticsClient;
   std::unique_ptr<cxx::TranslationUnit> unit;
   val api;
+#ifdef CXX_WITH_MLIR
+  std::unique_ptr<cxx::Toolchain> toolchain_;
+#endif
 
   WrappedUnit(std::string source, std::string filename, val api = {})
       : api(api) {
@@ -84,6 +87,13 @@ struct WrappedUnit {
     }
 
     unit->beginPreprocessing(std::move(source), std::move(filename));
+
+#ifdef CXX_WITH_MLIR
+    auto tc = std::make_unique<cxx::Wasm32WasiToolchain>(unit->preprocessor());
+    tc->initMemoryLayout();
+    tc->addPredefinedMacros();
+    toolchain_ = std::move(tc);
+#endif
   }
 
   auto getUnitHandle() const -> std::intptr_t {
@@ -182,7 +192,9 @@ struct WrappedUnit {
 
     unit->endPreprocessing();
 
-    unit->parse();
+    unit->parse(cxx::ParserConfiguration{
+        .checkTypes = true,
+    });
 
     co_return val{true};
   }
@@ -190,23 +202,27 @@ struct WrappedUnit {
   auto emitIR() -> std::string {
 #ifdef CXX_WITH_MLIR
     mlir::MLIRContext context;
+    context.disableMultithreading();
     context.loadDialect<mlir::cxx::CxxDialect>();
 
-    cxx::Codegen codegen(context, unit.get());
+    const auto emitDebugInfo = true;
+    const auto pretty = false;
+
+    cxx::Codegen codegen(context, unit.get(), emitDebugInfo);
 
     auto ir = codegen(unit->ast());
 
+    (void)cxx::lowerToMLIR(ir.module);
+
     mlir::OpPrintingFlags flags;
-    flags.enableDebugInfo(true, true);
+    flags.enableDebugInfo(emitDebugInfo, pretty);
 
     std::ostringstream out;
     llvm::raw_os_ostream os(out);
     ir.module->print(os, flags);
     os.flush();
 
-    auto code = out.str();
-
-    return code;
+    return out.str();
 #else
     return {};
 #endif
diff --git a/src/mlir/cxx/mlir/codegen.cc b/src/mlir/cxx/mlir/codegen.cc
index bc0f147b..60ebf86b 100644
--- a/src/mlir/cxx/mlir/codegen.cc
+++ b/src/mlir/cxx/mlir/codegen.cc
@@ -1204,7 +1204,7 @@ auto Codegen::getFileAttr(const std::string& filename)
     return it->second;
   }
 
-  auto filePath = absolute(std::filesystem::path{filename});
+  auto filePath = std::filesystem::path{filename};
 
   auto attr = mlir::LLVM::DIFileAttr::get(
       context_, filePath.filename().string(), filePath.parent_path().string());
diff --git a/src/parser/cxx/cli.cc b/src/parser/cxx/cli.cc
index 4e38537e..d461e5a6 100644
--- a/src/parser/cxx/cli.cc
+++ b/src/parser/cxx/cli.cc
@@ -155,7 +155,10 @@ std::vector<CLIOptionDescr> options{
     {"-x", "Specify the language from the compiler driver, e.g. c, or c++",
      CLIOptionDescrKind::kSeparated},
 
-    {"-fcheck", "Enable type checker (WIP)", &CLI::opt_fcheck},
+    {"-fcheck", "Enable type checker", &CLI::opt_fcheck},
+
+    {"-fno-check", "Disable type checker (implies -fsyntax-only)",
+     &CLI::opt_fno_check},
 
     {"-fsyntax-only", "Check only the syntax", &CLI::opt_fsyntax_only},
 
diff --git a/src/parser/cxx/cli.h b/src/parser/cxx/cli.h
index b1ed88a3..7ad59ced 100644
--- a/src/parser/cxx/cli.h
+++ b/src/parser/cxx/cli.h
@@ -70,7 +70,8 @@ class CLI {
   bool opt_S = false;
   bool opt_c = false;
   bool opt_fsyntax_only = false;
-  bool opt_fcheck = false;
+  bool opt_fcheck = true;
+  bool opt_fno_check = false;
   bool opt_freport_missing_types = false;
   bool opt_fno_reflect = false;
   bool opt_fno_strict_prototypes = false;
diff --git a/src/parser/cxx/substitution.cc b/src/parser/cxx/substitution.cc
index 958df2d2..c26eb7a7 100644
--- a/src/parser/cxx/substitution.cc
+++ b/src/parser/cxx/substitution.cc
@@ -349,7 +349,7 @@ void Substitution::doMake() {
     if (!isPackParameter(parameters[i])) continue;
     packIndex = i;
 
-    // Count trailing non-pack parameters that don't have defaults —
+    // Count trailing non-pack parameters that don't have defaults -
     // they need their own arguments, so the pack can't consume those.
     int trailingRequired = 0;
     for (int j = i + 1; j < paramCount; ++j) {
diff --git a/src/parser/cxx/type_checker.cc b/src/parser/cxx/type_checker.cc
index 02295af9..af6a6b29 100644
--- a/src/parser/cxx/type_checker.cc
+++ b/src/parser/cxx/type_checker.cc
@@ -2256,7 +2256,7 @@ auto TypeChecker::Visitor::check_reinterpret_cast(ExpressionAST*& expression,
        check.unit_->typeTraits().is_enum(sourceType) ||
        check.unit_->typeTraits().is_scoped_enum(sourceType)) &&
       check.unit_->typeTraits().is_pointer(targetType)) {
-    // No implicit cast wrapper — CastExpressionAST codegen emits IntToPtrOp.
+    // No implicit cast wrapper - CastExpressionAST codegen emits IntToPtrOp.
     return true;
   }
 
diff --git a/templates/cxx-parse/index.js b/templates/cxx-parse/index.js
index 414b9085..498dd788 100644
--- a/templates/cxx-parse/index.js
+++ b/templates/cxx-parse/index.js
@@ -23,25 +23,15 @@ import { readFile } from "fs/promises";
 import { fileURLToPath } from "node:url";
 
 const source = `
-template <typename T>
-concept CanAdd = requires(T n) {
-  n + n;
-};
-
-auto twice(CanAdd auto n) {
-  return n + n;
-}
-
-const char* str = "hello";
+auto twice(auto x) { return x + x; }
 
 int main() {
-  return twice(2);
+  return twice(21) - 42;
 }
 `;
 
 async function main() {
-  const wasmBinaryUrl = import.meta
-    .resolve("cxx-frontend/wasm");
+  const wasmBinaryUrl = import.meta.resolve("cxx-frontend/wasm");
   const wasmBinaryFile = fileURLToPath(wasmBinaryUrl);
   const wasmBinary = await readFile(wasmBinaryFile);
 
@@ -58,6 +48,8 @@ async function main() {
     console.log("diagnostics", diagnostics);
   }
 
+  console.log("==== AST ====");
+
   for (const { node, slot, depth } of ast?.walk().preVisit() ?? []) {
     if (!(node instanceof AST)) continue;
     const ind = " ".repeat(depth * 2);
@@ -66,7 +58,12 @@ async function main() {
     console.log(`${ind}- ${member}${kind}`);
   }
 
+  const ir = await parser.emitIR();
+
+  console.log("==== IR ====");
+  console.log(ir);
+
   parser.dispose();
 }
 
-main().catch(console.error);
+await main();
diff --git a/tests/unit_tests/ast/access_declaration_01.cc b/tests/unit_tests/ast/access_declaration_01.cc
index d93ee589..d6ab8f41 100644
--- a/tests/unit_tests/ast/access_declaration_01.cc
+++ b/tests/unit_tests/ast/access_declaration_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 class SimpleClass {
  private:
diff --git a/tests/unit_tests/ast/array_to_pointer_conv_01.cc b/tests/unit_tests/ast/array_to_pointer_conv_01.cc
index 089ebb1b..55a99253 100644
--- a/tests/unit_tests/ast/array_to_pointer_conv_01.cc
+++ b/tests/unit_tests/ast/array_to_pointer_conv_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 auto main() -> int {
   int a[10];
diff --git a/tests/unit_tests/ast/asm_declaration_01.cc b/tests/unit_tests/ast/asm_declaration_01.cc
index e3d5947f..236acaa8 100644
--- a/tests/unit_tests/ast/asm_declaration_01.cc
+++ b/tests/unit_tests/ast/asm_declaration_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 void asm_qualifiers() {
   asm("nop");
diff --git a/tests/unit_tests/ast/binary_expression_01.cc b/tests/unit_tests/ast/binary_expression_01.cc
index 33b52f99..7c7f343f 100644
--- a/tests/unit_tests/ast/binary_expression_01.cc
+++ b/tests/unit_tests/ast/binary_expression_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 int a = 10;
 int b = 20;
diff --git a/tests/unit_tests/ast/bitfield_declaration_01.cc b/tests/unit_tests/ast/bitfield_declaration_01.cc
index b6fac9b1..6c566c45 100644
--- a/tests/unit_tests/ast/bitfield_declaration_01.cc
+++ b/tests/unit_tests/ast/bitfield_declaration_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct Bits {
   int value : 32;
diff --git a/tests/unit_tests/ast/bool_literals_01.cc b/tests/unit_tests/ast/bool_literals_01.cc
index 2e11d05b..36b657fa 100644
--- a/tests/unit_tests/ast/bool_literals_01.cc
+++ b/tests/unit_tests/ast/bool_literals_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 const bool ok = true;
 const bool ko = false;
diff --git a/tests/unit_tests/ast/boolean_conv_01.cc b/tests/unit_tests/ast/boolean_conv_01.cc
index 3c0c0073..582ad58f 100644
--- a/tests/unit_tests/ast/boolean_conv_01.cc
+++ b/tests/unit_tests/ast/boolean_conv_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 auto main() -> int {
   void* ptr;
diff --git a/tests/unit_tests/ast/class_definition_01.cc b/tests/unit_tests/ast/class_definition_01.cc
index 40b1bc57..c9660e05 100644
--- a/tests/unit_tests/ast/class_definition_01.cc
+++ b/tests/unit_tests/ast/class_definition_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 class EmptyClass {};
 
diff --git a/tests/unit_tests/ast/complex_type_specifier_01.cc b/tests/unit_tests/ast/complex_type_specifier_01.cc
index 48283230..161827d1 100644
--- a/tests/unit_tests/ast/complex_type_specifier_01.cc
+++ b/tests/unit_tests/ast/complex_type_specifier_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 __complex__ float a;
 __complex__ double b;
diff --git a/tests/unit_tests/ast/consteval_if_01.cc b/tests/unit_tests/ast/consteval_if_01.cc
index ff87d9ef..2d650291 100644
--- a/tests/unit_tests/ast/consteval_if_01.cc
+++ b/tests/unit_tests/ast/consteval_if_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 auto main() -> int {
   if consteval {
diff --git a/tests/unit_tests/ast/constrained_template_parameter_01.cc b/tests/unit_tests/ast/constrained_template_parameter_01.cc
index 7aadd0fd..f68dd906 100644
--- a/tests/unit_tests/ast/constrained_template_parameter_01.cc
+++ b/tests/unit_tests/ast/constrained_template_parameter_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 template <typename T>
 concept Any = true;
diff --git a/tests/unit_tests/ast/ctor_initializer_01.cc b/tests/unit_tests/ast/ctor_initializer_01.cc
index ae34346f..e41e89cc 100644
--- a/tests/unit_tests/ast/ctor_initializer_01.cc
+++ b/tests/unit_tests/ast/ctor_initializer_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct Handle {
   int zero_;
diff --git a/tests/unit_tests/ast/deduce_this_01.cc b/tests/unit_tests/ast/deduce_this_01.cc
index 60fc3330..57d06ef2 100644
--- a/tests/unit_tests/ast/deduce_this_01.cc
+++ b/tests/unit_tests/ast/deduce_this_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 template <typename T>
 concept ok = true;
diff --git a/tests/unit_tests/ast/deduction_guide_01.cc b/tests/unit_tests/ast/deduction_guide_01.cc
index b550de70..ca169755 100644
--- a/tests/unit_tests/ast/deduction_guide_01.cc
+++ b/tests/unit_tests/ast/deduction_guide_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 template <typename T>
 struct List {
diff --git a/tests/unit_tests/ast/deduction_guide_02.cc b/tests/unit_tests/ast/deduction_guide_02.cc
index a29aeb72..3652dd27 100644
--- a/tests/unit_tests/ast/deduction_guide_02.cc
+++ b/tests/unit_tests/ast/deduction_guide_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct List {
   template <typename T>
diff --git a/tests/unit_tests/ast/designated_initializer_01.cc b/tests/unit_tests/ast/designated_initializer_01.cc
index ec1e59f1..fd37d38b 100644
--- a/tests/unit_tests/ast/designated_initializer_01.cc
+++ b/tests/unit_tests/ast/designated_initializer_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct Pair {
   int first;
diff --git a/tests/unit_tests/ast/enum_definition_01.cc b/tests/unit_tests/ast/enum_definition_01.cc
index 8aed2a8b..10d43cc6 100644
--- a/tests/unit_tests/ast/enum_definition_01.cc
+++ b/tests/unit_tests/ast/enum_definition_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 enum Kind {
   k1,
diff --git a/tests/unit_tests/ast/equal_initializer_01.cc b/tests/unit_tests/ast/equal_initializer_01.cc
index adf66444..c074c3e1 100644
--- a/tests/unit_tests/ast/equal_initializer_01.cc
+++ b/tests/unit_tests/ast/equal_initializer_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 const int values[] = {
     1,
diff --git a/tests/unit_tests/ast/floating_integral_conv_01.cc b/tests/unit_tests/ast/floating_integral_conv_01.cc
index 36875b14..2492c795 100644
--- a/tests/unit_tests/ast/floating_integral_conv_01.cc
+++ b/tests/unit_tests/ast/floating_integral_conv_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 void f(int a, int b);
 
diff --git a/tests/unit_tests/ast/floating_point_conv_01.cc b/tests/unit_tests/ast/floating_point_conv_01.cc
index ed08a51c..9e6cdb88 100644
--- a/tests/unit_tests/ast/floating_point_conv_01.cc
+++ b/tests/unit_tests/ast/floating_point_conv_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 void f(int a, int b);
 
diff --git a/tests/unit_tests/ast/floating_point_promotion_01.cc b/tests/unit_tests/ast/floating_point_promotion_01.cc
index b0518bd5..23a19b55 100644
--- a/tests/unit_tests/ast/floating_point_promotion_01.cc
+++ b/tests/unit_tests/ast/floating_point_promotion_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 void f(int a, int b);
 
diff --git a/tests/unit_tests/ast/for_range_statement_01.cc b/tests/unit_tests/ast/for_range_statement_01.cc
index 0e616625..db4ee2b1 100644
--- a/tests/unit_tests/ast/for_range_statement_01.cc
+++ b/tests/unit_tests/ast/for_range_statement_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 int main() {
   for (int i : {10, 20, 30}) {
diff --git a/tests/unit_tests/ast/for_range_statement_02.cc b/tests/unit_tests/ast/for_range_statement_02.cc
index 15462af7..8fef9a44 100644
--- a/tests/unit_tests/ast/for_range_statement_02.cc
+++ b/tests/unit_tests/ast/for_range_statement_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 int main() {
   int map[][2] = {{1, 2}};
diff --git a/tests/unit_tests/ast/function_definition_01.cc b/tests/unit_tests/ast/function_definition_01.cc
index 0ab8f4e4..88935e7f 100644
--- a/tests/unit_tests/ast/function_definition_01.cc
+++ b/tests/unit_tests/ast/function_definition_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 void (*ptr)(){};
 
diff --git a/tests/unit_tests/ast/function_to_pointer_conv_01.cc b/tests/unit_tests/ast/function_to_pointer_conv_01.cc
index 2c638138..c9d9249f 100644
--- a/tests/unit_tests/ast/function_to_pointer_conv_01.cc
+++ b/tests/unit_tests/ast/function_to_pointer_conv_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 void f(int a, int b);
 
diff --git a/tests/unit_tests/ast/generic_selection_01.c b/tests/unit_tests/ast/generic_selection_01.c
index 6519479b..15b05b6d 100644
--- a/tests/unit_tests/ast/generic_selection_01.c
+++ b/tests/unit_tests/ast/generic_selection_01.c
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 // clang-format on
 
 int main() {
diff --git a/tests/unit_tests/ast/if_statement_01.cc b/tests/unit_tests/ast/if_statement_01.cc
index edc37e7e..27399583 100644
--- a/tests/unit_tests/ast/if_statement_01.cc
+++ b/tests/unit_tests/ast/if_statement_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 auto main() -> int {
   if (false)
diff --git a/tests/unit_tests/ast/integral_conversion_01.cc b/tests/unit_tests/ast/integral_conversion_01.cc
index 4bd2d56d..bca01de7 100644
--- a/tests/unit_tests/ast/integral_conversion_01.cc
+++ b/tests/unit_tests/ast/integral_conversion_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 void f(int a, int b);
 
diff --git a/tests/unit_tests/ast/integral_promotion_conv_01.cc b/tests/unit_tests/ast/integral_promotion_conv_01.cc
index 25649626..9499732f 100644
--- a/tests/unit_tests/ast/integral_promotion_conv_01.cc
+++ b/tests/unit_tests/ast/integral_promotion_conv_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 void f(int a, int b);
 
diff --git a/tests/unit_tests/ast/lambda_specifier_01.cc b/tests/unit_tests/ast/lambda_specifier_01.cc
index 19c5045f..dbe7bd3d 100644
--- a/tests/unit_tests/ast/lambda_specifier_01.cc
+++ b/tests/unit_tests/ast/lambda_specifier_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 auto main() -> int {
   auto consteval_lambda = []() consteval { return 0; };
diff --git a/tests/unit_tests/ast/namespace_definition_01.cc b/tests/unit_tests/ast/namespace_definition_01.cc
index 52a5f8f4..6dd3215e 100644
--- a/tests/unit_tests/ast/namespace_definition_01.cc
+++ b/tests/unit_tests/ast/namespace_definition_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 namespace {}
 
diff --git a/tests/unit_tests/ast/nested_templates_01.cc b/tests/unit_tests/ast/nested_templates_01.cc
index 63417a4c..613447be 100644
--- a/tests/unit_tests/ast/nested_templates_01.cc
+++ b/tests/unit_tests/ast/nested_templates_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 template <typename T, typename A>
 class List {
diff --git a/tests/unit_tests/ast/new_expression_01.cc b/tests/unit_tests/ast/new_expression_01.cc
index e9d28c1f..ac0c4d97 100644
--- a/tests/unit_tests/ast/new_expression_01.cc
+++ b/tests/unit_tests/ast/new_expression_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 template <typename T>
 auto make(void* where, T init) {
diff --git a/tests/unit_tests/ast/pack_expansion_01.cc b/tests/unit_tests/ast/pack_expansion_01.cc
index 507c2711..d091cd9e 100644
--- a/tests/unit_tests/ast/pack_expansion_01.cc
+++ b/tests/unit_tests/ast/pack_expansion_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 void foo() {}
 
diff --git a/tests/unit_tests/ast/parameter_pack_01.cc b/tests/unit_tests/ast/parameter_pack_01.cc
index 16459556..890310d4 100644
--- a/tests/unit_tests/ast/parameter_pack_01.cc
+++ b/tests/unit_tests/ast/parameter_pack_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 void func(auto... args);
 
diff --git a/tests/unit_tests/ast/reflect_01.cc b/tests/unit_tests/ast/reflect_01.cc
index dfc49958..9080d4db 100644
--- a/tests/unit_tests/ast/reflect_01.cc
+++ b/tests/unit_tests/ast/reflect_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 // clang-format on
 
 constexpr auto int_ty = ^^int;
diff --git a/tests/unit_tests/ast/reflect_02.cc b/tests/unit_tests/ast/reflect_02.cc
index 09a16fce..8e36d6c6 100644
--- a/tests/unit_tests/ast/reflect_02.cc
+++ b/tests/unit_tests/ast/reflect_02.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 // clang-format on
 
 struct S {
diff --git a/tests/unit_tests/ast/return_statement_01.cc b/tests/unit_tests/ast/return_statement_01.cc
index 69692c71..4032642c 100644
--- a/tests/unit_tests/ast/return_statement_01.cc
+++ b/tests/unit_tests/ast/return_statement_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct Pair {
   int first;
diff --git a/tests/unit_tests/ast/struct_alias_01.cc b/tests/unit_tests/ast/struct_alias_01.cc
index 0e144b93..69f73c79 100644
--- a/tests/unit_tests/ast/struct_alias_01.cc
+++ b/tests/unit_tests/ast/struct_alias_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 using Pair = struct {
   int a, b;
diff --git a/tests/unit_tests/ast/structured_binding_declaration_01.cc b/tests/unit_tests/ast/structured_binding_declaration_01.cc
index 9cab7e00..c5b32039 100644
--- a/tests/unit_tests/ast/structured_binding_declaration_01.cc
+++ b/tests/unit_tests/ast/structured_binding_declaration_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -fno-check -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct Pair {
   int first;
diff --git a/tests/unit_tests/ast/template_lambda_01.cc b/tests/unit_tests/ast/template_lambda_01.cc
index c261e69f..6b166210 100644
--- a/tests/unit_tests/ast/template_lambda_01.cc
+++ b/tests/unit_tests/ast/template_lambda_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/ast/template_member_expression_01.cc b/tests/unit_tests/ast/template_member_expression_01.cc
index c2d834a9..45d60405 100644
--- a/tests/unit_tests/ast/template_member_expression_01.cc
+++ b/tests/unit_tests/ast/template_member_expression_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct Allocator {
   template <typename T>
diff --git a/tests/unit_tests/ast/template_nested_name_specifier_01.cc b/tests/unit_tests/ast/template_nested_name_specifier_01.cc
index a14a84e8..c583dcae 100644
--- a/tests/unit_tests/ast/template_nested_name_specifier_01.cc
+++ b/tests/unit_tests/ast/template_nested_name_specifier_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 struct HelperT {
   template <typename T>
diff --git a/tests/unit_tests/ast/template_type_parameter_01.cc b/tests/unit_tests/ast/template_type_parameter_01.cc
index f833c342..1086cf45 100644
--- a/tests/unit_tests/ast/template_type_parameter_01.cc
+++ b/tests/unit_tests/ast/template_type_parameter_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 template <typename T, template <typename U> class C>
 struct S {
diff --git a/tests/unit_tests/ast/uchar_array_index_01.c b/tests/unit_tests/ast/uchar_array_index_01.c
index 7d4dd12a..fc654620 100644
--- a/tests/unit_tests/ast/uchar_array_index_01.c
+++ b/tests/unit_tests/ast/uchar_array_index_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s
 
 int main() {
   unsigned char c = 200;
diff --git a/tests/unit_tests/ast/underlying_type_specifier_01.cc b/tests/unit_tests/ast/underlying_type_specifier_01.cc
index 33bd85ed..2fd2de1b 100644
--- a/tests/unit_tests/ast/underlying_type_specifier_01.cc
+++ b/tests/unit_tests/ast/underlying_type_specifier_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 enum class fruit { orange, apple };
 
diff --git a/tests/unit_tests/ast/using_enum_declaration_01.cc b/tests/unit_tests/ast/using_enum_declaration_01.cc
index a3b0a5e1..bca7c2e2 100644
--- a/tests/unit_tests/ast/using_enum_declaration_01.cc
+++ b/tests/unit_tests/ast/using_enum_declaration_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 enum class fruit { orange, apple };
 
diff --git a/tests/unit_tests/ast/variadic_function_01.cc b/tests/unit_tests/ast/variadic_function_01.cc
index 0af022c5..c527edc0 100644
--- a/tests/unit_tests/ast/variadic_function_01.cc
+++ b/tests/unit_tests/ast/variadic_function_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 void print_like(const char* fmt, ...);
 
diff --git a/tests/unit_tests/ast/variadic_function_02.cc b/tests/unit_tests/ast/variadic_function_02.cc
index 6fab95d6..8a2cbfcd 100644
--- a/tests/unit_tests/ast/variadic_function_02.cc
+++ b/tests/unit_tests/ast/variadic_function_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -verify -ast-dump %s | %filecheck %s --match-full-lines
+// RUN: %cxx -verify -ast-dump %s | %filecheck %s --match-full-lines
 
 void ff(int count, ...) {
   __builtin_va_list args;
diff --git a/tests/unit_tests/codegen/designated_array2d_sema_01.c b/tests/unit_tests/codegen/designated_array2d_sema_01.c
index 78e7c277..ce82745a 100644
--- a/tests/unit_tests/codegen/designated_array2d_sema_01.c
+++ b/tests/unit_tests/codegen/designated_array2d_sema_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 static int mat[3][4] = {
diff --git a/tests/unit_tests/parser/c_stdlib.c b/tests/unit_tests/parser/c_stdlib.c
index 25eb271a..19fbe8bd 100644
--- a/tests/unit_tests/parser/c_stdlib.c
+++ b/tests/unit_tests/parser/c_stdlib.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain wasm32 -verify -fcheck %s
+// RUN: %cxx -toolchain wasm32 -verify %s
 
 #include <assert.h>
 #include <complex.h>
diff --git a/tests/unit_tests/parser/indirect_goto.c b/tests/unit_tests/parser/indirect_goto.c
index 695c5ccc..16e776ed 100644
--- a/tests/unit_tests/parser/indirect_goto.c
+++ b/tests/unit_tests/parser/indirect_goto.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // GCC extension: &&label gives the address of a label as void*
 // goto *expr jumps to the address stored in expr
diff --git a/tests/unit_tests/parser/indirect_goto.cc b/tests/unit_tests/parser/indirect_goto.cc
index 0d83cd43..c2ddeee1 100644
--- a/tests/unit_tests/parser/indirect_goto.cc
+++ b/tests/unit_tests/parser/indirect_goto.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <bool Flag>
 int dispatch(void) {
diff --git a/tests/unit_tests/parser/postfix_expr_conflicts.cc b/tests/unit_tests/parser/postfix_expr_conflicts.cc
index 2fb8e261..e78eacdb 100644
--- a/tests/unit_tests/parser/postfix_expr_conflicts.cc
+++ b/tests/unit_tests/parser/postfix_expr_conflicts.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify %s
+// RUN: %cxx -fno-check -verify %s
 
 auto incr(int x) -> int { return x++; }
 auto decr(int x) -> int { return x--; }
diff --git a/tests/unit_tests/sema/address_op_01.cc b/tests/unit_tests/sema/address_op_01.cc
index fd73342b..4fd3a38f 100644
--- a/tests/unit_tests/sema/address_op_01.cc
+++ b/tests/unit_tests/sema/address_op_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct X {
   int m{};
diff --git a/tests/unit_tests/sema/adl_01.cc b/tests/unit_tests/sema/adl_01.cc
index f1b6c244..2d71ad95 100644
--- a/tests/unit_tests/sema/adl_01.cc
+++ b/tests/unit_tests/sema/adl_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 extern "C" int printf(const char*, ...);
 
diff --git a/tests/unit_tests/sema/adl_auto_param_01.cc b/tests/unit_tests/sema/adl_auto_param_01.cc
index b0253d32..c4781f40 100644
--- a/tests/unit_tests/sema/adl_auto_param_01.cc
+++ b/tests/unit_tests/sema/adl_auto_param_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto add(auto x, auto y) -> decltype(x + y) { return x + y; }
 
diff --git a/tests/unit_tests/sema/adl_call_01.cc b/tests/unit_tests/sema/adl_call_01.cc
index 94d7f436..ba52dbea 100644
--- a/tests/unit_tests/sema/adl_call_01.cc
+++ b/tests/unit_tests/sema/adl_call_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 T foo(T x) {
diff --git a/tests/unit_tests/sema/adl_free_operator_01.cc b/tests/unit_tests/sema/adl_free_operator_01.cc
index bb885e7b..3be3fb12 100644
--- a/tests/unit_tests/sema/adl_free_operator_01.cc
+++ b/tests/unit_tests/sema/adl_free_operator_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 T foo(T x) {
diff --git a/tests/unit_tests/sema/adl_member_operator_01.cc b/tests/unit_tests/sema/adl_member_operator_01.cc
index 048a86c0..0189f77e 100644
--- a/tests/unit_tests/sema/adl_member_operator_01.cc
+++ b/tests/unit_tests/sema/adl_member_operator_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 T foo(T x) {
diff --git a/tests/unit_tests/sema/adl_template_arg_namespace_01.cc b/tests/unit_tests/sema/adl_template_arg_namespace_01.cc
index 35657d1f..2d80ba52 100644
--- a/tests/unit_tests/sema/adl_template_arg_namespace_01.cc
+++ b/tests/unit_tests/sema/adl_template_arg_namespace_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 namespace lib {
 
diff --git a/tests/unit_tests/sema/aggregate_copy_init_01.c b/tests/unit_tests/sema/aggregate_copy_init_01.c
index 587c2556..73d3238a 100644
--- a/tests/unit_tests/sema/aggregate_copy_init_01.c
+++ b/tests/unit_tests/sema/aggregate_copy_init_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Point {
diff --git a/tests/unit_tests/sema/aligned_union_01.cc b/tests/unit_tests/sema/aligned_union_01.cc
index 14fcf08b..5c2f3e7e 100644
--- a/tests/unit_tests/sema/aligned_union_01.cc
+++ b/tests/unit_tests/sema/aligned_union_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Test: static const members with dependent initializers used as NTTP args
 // in a nested template NNS should not trigger premature instantiation.
diff --git a/tests/unit_tests/sema/aligned_union_02.cc b/tests/unit_tests/sema/aligned_union_02.cc
index e4b3c8f0..7e935243 100644
--- a/tests/unit_tests/sema/aligned_union_02.cc
+++ b/tests/unit_tests/sema/aligned_union_02.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Test: NNS with dependent static const member used as NTTP works
 // when the template is actually instantiated with concrete values.
diff --git a/tests/unit_tests/sema/alignof_01.cc b/tests/unit_tests/sema/alignof_01.cc
index 09c4dbce..8459a907 100644
--- a/tests/unit_tests/sema/alignof_01.cc
+++ b/tests/unit_tests/sema/alignof_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain wasm32 -verify -fcheck %s
+// RUN: %cxx -toolchain wasm32 -verify %s
 
 static_assert(alignof(bool) == 1);
 static_assert(alignof(signed char) == 1);
diff --git a/tests/unit_tests/sema/anon_struct_layout_01.cc b/tests/unit_tests/sema/anon_struct_layout_01.cc
index 03055b78..7a483462 100644
--- a/tests/unit_tests/sema/anon_struct_layout_01.cc
+++ b/tests/unit_tests/sema/anon_struct_layout_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -toolchain macos -fcheck -dump-record-layouts %s | %filecheck %s
+// RUN: %cxx -toolchain macos -dump-record-layouts %s | %filecheck %s
 
 // Anonymous union with bitfields and regular fields interleaved with
 // anonymous structs. Verifies layout sizes, offsets, and nesting.
diff --git a/tests/unit_tests/sema/anon_struct_layout_02.cc b/tests/unit_tests/sema/anon_struct_layout_02.cc
index b7400df3..ae249d7b 100644
--- a/tests/unit_tests/sema/anon_struct_layout_02.cc
+++ b/tests/unit_tests/sema/anon_struct_layout_02.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -toolchain macos -fcheck -dump-record-layouts %s | %filecheck %s
+// RUN: %cxx -toolchain macos -dump-record-layouts %s | %filecheck %s
 
 // Anonymous union/struct with regular fields, verifying field ordering
 // and layout when anonymous members are interleaved with named fields.
diff --git a/tests/unit_tests/sema/assignment_void_pointer_c_01.c b/tests/unit_tests/sema/assignment_void_pointer_c_01.c
index 2405abb1..af71f0d7 100644
--- a/tests/unit_tests/sema/assignment_void_pointer_c_01.c
+++ b/tests/unit_tests/sema/assignment_void_pointer_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 void* malloc(unsigned long);
diff --git a/tests/unit_tests/sema/assignment_void_pointer_cpp_01.cc b/tests/unit_tests/sema/assignment_void_pointer_cpp_01.cc
index 5f7f20a9..e69c788b 100644
--- a/tests/unit_tests/sema/assignment_void_pointer_cpp_01.cc
+++ b/tests/unit_tests/sema/assignment_void_pointer_cpp_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 void* malloc(unsigned long);
 
diff --git a/tests/unit_tests/sema/auto_template.cc b/tests/unit_tests/sema/auto_template.cc
index 3446c85b..1022fd46 100644
--- a/tests/unit_tests/sema/auto_template.cc
+++ b/tests/unit_tests/sema/auto_template.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 extern "C" {
 int printf(const char* format, ...);
diff --git a/tests/unit_tests/sema/binary_invalid_bitwise_operands_01.cc b/tests/unit_tests/sema/binary_invalid_bitwise_operands_01.cc
index 68742f9b..a0f038d2 100644
--- a/tests/unit_tests/sema/binary_invalid_bitwise_operands_01.cc
+++ b/tests/unit_tests/sema/binary_invalid_bitwise_operands_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {};
 
diff --git a/tests/unit_tests/sema/binary_invalid_logical_operands_01.cc b/tests/unit_tests/sema/binary_invalid_logical_operands_01.cc
index 74244875..e1a5dfa0 100644
--- a/tests/unit_tests/sema/binary_invalid_logical_operands_01.cc
+++ b/tests/unit_tests/sema/binary_invalid_logical_operands_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {};
 
diff --git a/tests/unit_tests/sema/binder_duplicate_field_01.cc b/tests/unit_tests/sema/binder_duplicate_field_01.cc
index 15f2ded2..c1d0bf83 100644
--- a/tests/unit_tests/sema/binder_duplicate_field_01.cc
+++ b/tests/unit_tests/sema/binder_duplicate_field_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {
   int value;
diff --git a/tests/unit_tests/sema/binder_invalid_template_id_01.cc b/tests/unit_tests/sema/binder_invalid_template_id_01.cc
index 8cb21114..57892bdf 100644
--- a/tests/unit_tests/sema/binder_invalid_template_id_01.cc
+++ b/tests/unit_tests/sema/binder_invalid_template_id_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 int fn();
diff --git a/tests/unit_tests/sema/binder_nested_name_wrong_01.cc b/tests/unit_tests/sema/binder_nested_name_wrong_01.cc
index 313031d3..7d82da87 100644
--- a/tests/unit_tests/sema/binder_nested_name_wrong_01.cc
+++ b/tests/unit_tests/sema/binder_nested_name_wrong_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int NotAScope = 0;
 
diff --git a/tests/unit_tests/sema/binder_typealias_conflict_01.cc b/tests/unit_tests/sema/binder_typealias_conflict_01.cc
index 4e854be2..7e2f4354 100644
--- a/tests/unit_tests/sema/binder_typealias_conflict_01.cc
+++ b/tests/unit_tests/sema/binder_typealias_conflict_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 typedef int Value;
 typedef float Value;  // expected-error {{conflicting declaration of 'Value'}}
diff --git a/tests/unit_tests/sema/binder_typealias_symbol_conflict_01.cc b/tests/unit_tests/sema/binder_typealias_symbol_conflict_01.cc
index 4ae72f96..7730d1b6 100644
--- a/tests/unit_tests/sema/binder_typealias_symbol_conflict_01.cc
+++ b/tests/unit_tests/sema/binder_typealias_symbol_conflict_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int Value;
 typedef int Value;  // expected-error {{conflicting declaration of 'Value'}}
diff --git a/tests/unit_tests/sema/binder_unknown_base_class_01.cc b/tests/unit_tests/sema/binder_unknown_base_class_01.cc
index 9b3c57df..ef244899 100644
--- a/tests/unit_tests/sema/binder_unknown_base_class_01.cc
+++ b/tests/unit_tests/sema/binder_unknown_base_class_01.cc
@@ -1,3 +1,3 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct D : MissingBase {};  // expected-error {{unknown base class 'MissingBase'}}
diff --git a/tests/unit_tests/sema/binder_using_unresolved_01.cc b/tests/unit_tests/sema/binder_using_unresolved_01.cc
index b8f36669..1778514d 100644
--- a/tests/unit_tests/sema/binder_using_unresolved_01.cc
+++ b/tests/unit_tests/sema/binder_using_unresolved_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Base {};
 
diff --git a/tests/unit_tests/sema/bitfield_init_c_01.c b/tests/unit_tests/sema/bitfield_init_c_01.c
index de4f88b0..fd6a2d81 100644
--- a/tests/unit_tests/sema/bitfield_init_c_01.c
+++ b/tests/unit_tests/sema/bitfield_init_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -fsyntax-only -verify -fcheck %s
+// RUN: %cxx -fsyntax-only -verify %s
 // expected-no-diagnostics
 
 // Test non-designated struct init with bitfields.
diff --git a/tests/unit_tests/sema/bitfields_01.cc b/tests/unit_tests/sema/bitfields_01.cc
index 624ee0d0..196b4b1d 100644
--- a/tests/unit_tests/sema/bitfields_01.cc
+++ b/tests/unit_tests/sema/bitfields_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {
   int a : 3;
diff --git a/tests/unit_tests/sema/bitfields_layout_01.cc b/tests/unit_tests/sema/bitfields_layout_01.cc
index 5b7e51ae..d7c0f171 100644
--- a/tests/unit_tests/sema/bitfields_layout_01.cc
+++ b/tests/unit_tests/sema/bitfields_layout_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-record-layouts %s | %filecheck %s
+// RUN: %cxx -dump-record-layouts %s | %filecheck %s
 
 struct A {
   int a : 3;
diff --git a/tests/unit_tests/sema/bitfields_layout_02.cc b/tests/unit_tests/sema/bitfields_layout_02.cc
index 6fafc8e7..d8f17a6b 100644
--- a/tests/unit_tests/sema/bitfields_layout_02.cc
+++ b/tests/unit_tests/sema/bitfields_layout_02.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -toolchain macos -fcheck -dump-record-layouts %s | %filecheck %s
+// RUN: %cxx -toolchain macos -dump-record-layouts %s | %filecheck %s
 
 // Cross-type packing (Itanium ABI: all fit contiguously)
 struct X {
diff --git a/tests/unit_tests/sema/bitfields_layout_03.cc b/tests/unit_tests/sema/bitfields_layout_03.cc
index 4209bb2c..f3c4ad46 100644
--- a/tests/unit_tests/sema/bitfields_layout_03.cc
+++ b/tests/unit_tests/sema/bitfields_layout_03.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -toolchain macos -fcheck -dump-record-layouts %s | %filecheck %s
+// RUN: %cxx -toolchain macos -dump-record-layouts %s | %filecheck %s
 
 // Bitfield then regular field then bitfield (Itanium ABI packing)
 struct T1 { int a : 2; char b; int c : 3; };
diff --git a/tests/unit_tests/sema/bitint_01.cc b/tests/unit_tests/sema/bitint_01.cc
index 677fc454..14bd6648 100644
--- a/tests/unit_tests/sema/bitint_01.cc
+++ b/tests/unit_tests/sema/bitint_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 // expected-no-diagnostics
 
 constexpr unsigned N = 128;
diff --git a/tests/unit_tests/sema/bitint_02.cc b/tests/unit_tests/sema/bitint_02.cc
index f2020a53..d8752b38 100644
--- a/tests/unit_tests/sema/bitint_02.cc
+++ b/tests/unit_tests/sema/bitint_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 // expected-no-diagnostics
 
 int main() {
diff --git a/tests/unit_tests/sema/bitint_negative_size_01.cc b/tests/unit_tests/sema/bitint_negative_size_01.cc
index b8997281..d52956fd 100644
--- a/tests/unit_tests/sema/bitint_negative_size_01.cc
+++ b/tests/unit_tests/sema/bitint_negative_size_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 
 _BitInt(-1) a;          // expected-error {{signed _BitInt of bit sizes greater than 128 not supported}}
 unsigned _BitInt(-1) b; // expected-error {{unsigned _BitInt of bit sizes greater than 128 not supported}}
diff --git a/tests/unit_tests/sema/bitint_sizeof_01.cc b/tests/unit_tests/sema/bitint_sizeof_01.cc
index c4759ef5..7321a79d 100644
--- a/tests/unit_tests/sema/bitint_sizeof_01.cc
+++ b/tests/unit_tests/sema/bitint_sizeof_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 // expected-no-diagnostics
 
 static_assert(sizeof(_BitInt(8)) == 1);
diff --git a/tests/unit_tests/sema/bitint_template_param_01.cc b/tests/unit_tests/sema/bitint_template_param_01.cc
index 83f47e85..162b1469 100644
--- a/tests/unit_tests/sema/bitint_template_param_01.cc
+++ b/tests/unit_tests/sema/bitint_template_param_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck %s
+// RUN: %cxx %s
 // expected-no-diagnostics
 
 template <int i>
diff --git a/tests/unit_tests/sema/bitint_too_large_01.cc b/tests/unit_tests/sema/bitint_too_large_01.cc
index b5f3afa8..dc360193 100644
--- a/tests/unit_tests/sema/bitint_too_large_01.cc
+++ b/tests/unit_tests/sema/bitint_too_large_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 
 unsigned _BitInt(129) a; // expected-error {{unsigned _BitInt of bit sizes greater than 128 not supported}}
 unsigned _BitInt(256) b; // expected-error {{unsigned _BitInt of bit sizes greater than 128 not supported}}
diff --git a/tests/unit_tests/sema/bitint_too_small_01.cc b/tests/unit_tests/sema/bitint_too_small_01.cc
index ff638397..39adf476 100644
--- a/tests/unit_tests/sema/bitint_too_small_01.cc
+++ b/tests/unit_tests/sema/bitint_too_small_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 
 _BitInt(0) a;          // expected-error {{signed _BitInt must have a bit size of at least 2}}
 _BitInt(1) b;          // expected-error {{signed _BitInt must have a bit size of at least 2}}
diff --git a/tests/unit_tests/sema/bitint_wb_literals_01.cc b/tests/unit_tests/sema/bitint_wb_literals_01.cc
index b0505b31..1287e0a6 100644
--- a/tests/unit_tests/sema/bitint_wb_literals_01.cc
+++ b/tests/unit_tests/sema/bitint_wb_literals_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 // expected-no-diagnostics
 
 static_assert(__is_same(decltype(3wb),    _BitInt(3)));
diff --git a/tests/unit_tests/sema/bitint_wb_literals_02.cc b/tests/unit_tests/sema/bitint_wb_literals_02.cc
index 078dea97..31588734 100644
--- a/tests/unit_tests/sema/bitint_wb_literals_02.cc
+++ b/tests/unit_tests/sema/bitint_wb_literals_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 // expected-no-diagnostics
 
 static_assert(sizeof(3wb)    == 1);
diff --git a/tests/unit_tests/sema/bitwise_not_01.cc b/tests/unit_tests/sema/bitwise_not_01.cc
index 3c8cefc3..3ca5494b 100644
--- a/tests/unit_tests/sema/bitwise_not_01.cc
+++ b/tests/unit_tests/sema/bitwise_not_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto main() -> int {
   static_assert(__is_same(decltype(~'a'), int));
diff --git a/tests/unit_tests/sema/brace_elision_c_01.c b/tests/unit_tests/sema/brace_elision_c_01.c
index 8e8fb289..b0df9af1 100644
--- a/tests/unit_tests/sema/brace_elision_c_01.c
+++ b/tests/unit_tests/sema/brace_elision_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct point {
diff --git a/tests/unit_tests/sema/builtin_alloca_01.cc b/tests/unit_tests/sema/builtin_alloca_01.cc
index afde5818..c4a38398 100644
--- a/tests/unit_tests/sema/builtin_alloca_01.cc
+++ b/tests/unit_tests/sema/builtin_alloca_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 void test(int n) {
   void* p = __builtin_alloca(n);
diff --git a/tests/unit_tests/sema/builtin_bit_cast_diag_01.cc b/tests/unit_tests/sema/builtin_bit_cast_diag_01.cc
index 4df75ccd..b12eeb5e 100644
--- a/tests/unit_tests/sema/builtin_bit_cast_diag_01.cc
+++ b/tests/unit_tests/sema/builtin_bit_cast_diag_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // expected-error@1 {{__builtin_bit_cast requires source and destination to have the same size}}
 auto bad = __builtin_bit_cast(double, 1);
diff --git a/tests/unit_tests/sema/builtin_bit_cast_ok_01.cc b/tests/unit_tests/sema/builtin_bit_cast_ok_01.cc
index b407d266..da51a989 100644
--- a/tests/unit_tests/sema/builtin_bit_cast_ok_01.cc
+++ b/tests/unit_tests/sema/builtin_bit_cast_ok_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 auto ok = __builtin_bit_cast(float, 1);
diff --git a/tests/unit_tests/sema/builtin_constant_p_01.cc b/tests/unit_tests/sema/builtin_constant_p_01.cc
index e148228f..008343ad 100644
--- a/tests/unit_tests/sema/builtin_constant_p_01.cc
+++ b/tests/unit_tests/sema/builtin_constant_p_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 static_assert(__builtin_constant_p(42));
diff --git a/tests/unit_tests/sema/builtin_functions_01.cc b/tests/unit_tests/sema/builtin_functions_01.cc
index 5833d96d..218ee725 100644
--- a/tests/unit_tests/sema/builtin_functions_01.cc
+++ b/tests/unit_tests/sema/builtin_functions_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // expected-no-diagnostics
 
diff --git a/tests/unit_tests/sema/builtin_huge_val_01.cc b/tests/unit_tests/sema/builtin_huge_val_01.cc
index 51b57cb3..2a3560f8 100644
--- a/tests/unit_tests/sema/builtin_huge_val_01.cc
+++ b/tests/unit_tests/sema/builtin_huge_val_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 static_assert(__builtin_huge_val() > 1e308);
 static_assert(__builtin_huge_valf() > 1e38f);
diff --git a/tests/unit_tests/sema/builtin_missing_diag_01.cc b/tests/unit_tests/sema/builtin_missing_diag_01.cc
index e19e0daa..5e9e796c 100644
--- a/tests/unit_tests/sema/builtin_missing_diag_01.cc
+++ b/tests/unit_tests/sema/builtin_missing_diag_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // expected-error@1 {{unknown builtin function '__builtin_shufflevector'}}
 int x = __builtin_shufflevector();
diff --git a/tests/unit_tests/sema/builtin_nans_01.cc b/tests/unit_tests/sema/builtin_nans_01.cc
index c4cb78f4..8d0e7bdc 100644
--- a/tests/unit_tests/sema/builtin_nans_01.cc
+++ b/tests/unit_tests/sema/builtin_nans_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 void test() {
   double d = __builtin_nans("");
diff --git a/tests/unit_tests/sema/builtin_operator_new_01.cc b/tests/unit_tests/sema/builtin_operator_new_01.cc
index 568ec5ca..ab2d5b6e 100644
--- a/tests/unit_tests/sema/builtin_operator_new_01.cc
+++ b/tests/unit_tests/sema/builtin_operator_new_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 void test() {
   void* p = __builtin_operator_new(16);
diff --git a/tests/unit_tests/sema/builtin_source_location_01.cc b/tests/unit_tests/sema/builtin_source_location_01.cc
index 5182fffa..4b3068fc 100644
--- a/tests/unit_tests/sema/builtin_source_location_01.cc
+++ b/tests/unit_tests/sema/builtin_source_location_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 static_assert(__builtin_LINE() > 0);
 
diff --git a/tests/unit_tests/sema/builtins_01.cc b/tests/unit_tests/sema/builtins_01.cc
index 7458b635..3ee8160d 100644
--- a/tests/unit_tests/sema/builtins_01.cc
+++ b/tests/unit_tests/sema/builtins_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Test builtin math functions
 void test_math_builtins() {
diff --git a/tests/unit_tests/sema/builtins_constexpr_01.cc b/tests/unit_tests/sema/builtins_constexpr_01.cc
index bcb65ebd..fa7a39bc 100644
--- a/tests/unit_tests/sema/builtins_constexpr_01.cc
+++ b/tests/unit_tests/sema/builtins_constexpr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 static_assert(__builtin_abs(-42) == 42);
diff --git a/tests/unit_tests/sema/byte_bitwise_wasm_01.cc b/tests/unit_tests/sema/byte_bitwise_wasm_01.cc
index b865c81b..cb00a5b6 100644
--- a/tests/unit_tests/sema/byte_bitwise_wasm_01.cc
+++ b/tests/unit_tests/sema/byte_bitwise_wasm_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -toolchain wasm32 %s
+// RUN: %cxx -verify -toolchain wasm32 %s
 // expected-no-diagnostics
 
 #include <cstddef>
diff --git a/tests/unit_tests/sema/c_style_cast_01.cc b/tests/unit_tests/sema/c_style_cast_01.cc
index b5d090ef..8e0c431e 100644
--- a/tests/unit_tests/sema/c_style_cast_01.cc
+++ b/tests/unit_tests/sema/c_style_cast_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct B {
   int x;
diff --git a/tests/unit_tests/sema/call_c_01.c b/tests/unit_tests/sema/call_c_01.c
index c9e99bc4..e4dd7f6d 100644
--- a/tests/unit_tests/sema/call_c_01.c
+++ b/tests/unit_tests/sema/call_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int f() { return 0; }
 
diff --git a/tests/unit_tests/sema/call_template_nontemplate_prefer_01.cc b/tests/unit_tests/sema/call_template_nontemplate_prefer_01.cc
index 7db92fee..305f78a9 100644
--- a/tests/unit_tests/sema/call_template_nontemplate_prefer_01.cc
+++ b/tests/unit_tests/sema/call_template_nontemplate_prefer_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct NonTemplateTag {};
diff --git a/tests/unit_tests/sema/call_user_conversion_template_overload_01.cc b/tests/unit_tests/sema/call_user_conversion_template_overload_01.cc
index 533cfe18..dfd1c522 100644
--- a/tests/unit_tests/sema/call_user_conversion_template_overload_01.cc
+++ b/tests/unit_tests/sema/call_user_conversion_template_overload_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Source {
diff --git a/tests/unit_tests/sema/cast_errors_01.cc b/tests/unit_tests/sema/cast_errors_01.cc
index 02180199..e081d516 100644
--- a/tests/unit_tests/sema/cast_errors_01.cc
+++ b/tests/unit_tests/sema/cast_errors_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct B {
   int x;
diff --git a/tests/unit_tests/sema/class_01.cc b/tests/unit_tests/sema/class_01.cc
index 0c015efc..ccb9366c 100644
--- a/tests/unit_tests/sema/class_01.cc
+++ b/tests/unit_tests/sema/class_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct X {
   void f() {
diff --git a/tests/unit_tests/sema/class_02.cc b/tests/unit_tests/sema/class_02.cc
index 9d450c20..f12cfbd3 100644
--- a/tests/unit_tests/sema/class_02.cc
+++ b/tests/unit_tests/sema/class_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct A {
   struct {
diff --git a/tests/unit_tests/sema/class_body_recovery_01.cc b/tests/unit_tests/sema/class_body_recovery_01.cc
index f15d4fdb..85515b21 100644
--- a/tests/unit_tests/sema/class_body_recovery_01.cc
+++ b/tests/unit_tests/sema/class_body_recovery_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // Tests that class body recovery skips to the next semicolon
 // and doesn't cascade hundreds of "expected a declaration" errors.
 
diff --git a/tests/unit_tests/sema/common_type_no_recursion_01.cc b/tests/unit_tests/sema/common_type_no_recursion_01.cc
index 7f1f12f9..c3638dcb 100644
--- a/tests/unit_tests/sema/common_type_no_recursion_01.cc
+++ b/tests/unit_tests/sema/common_type_no_recursion_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class _Tp, _Tp __v>
diff --git a/tests/unit_tests/sema/condition_decl_invalid_condition_01.cc b/tests/unit_tests/sema/condition_decl_invalid_condition_01.cc
index 090c86b1..f95a50bc 100644
--- a/tests/unit_tests/sema/condition_decl_invalid_condition_01.cc
+++ b/tests/unit_tests/sema/condition_decl_invalid_condition_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {};
 
diff --git a/tests/unit_tests/sema/conditional_expr_01.cc b/tests/unit_tests/sema/conditional_expr_01.cc
index 4afef90a..82279bb3 100644
--- a/tests/unit_tests/sema/conditional_expr_01.cc
+++ b/tests/unit_tests/sema/conditional_expr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Base {};
 struct Derived : Base {};
diff --git a/tests/unit_tests/sema/conditional_invalid_condition_01.cc b/tests/unit_tests/sema/conditional_invalid_condition_01.cc
index 878be2ea..70c6b58d 100644
--- a/tests/unit_tests/sema/conditional_invalid_condition_01.cc
+++ b/tests/unit_tests/sema/conditional_invalid_condition_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {};
 
diff --git a/tests/unit_tests/sema/conditional_ptr_conversion_c_01.c b/tests/unit_tests/sema/conditional_ptr_conversion_c_01.c
index 66172252..1b3e9acf 100644
--- a/tests/unit_tests/sema/conditional_ptr_conversion_c_01.c
+++ b/tests/unit_tests/sema/conditional_ptr_conversion_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Elem {
   struct Elem *next;
diff --git a/tests/unit_tests/sema/conditional_unresolved_operand_01.cc b/tests/unit_tests/sema/conditional_unresolved_operand_01.cc
index a2a9d596..f850d419 100644
--- a/tests/unit_tests/sema/conditional_unresolved_operand_01.cc
+++ b/tests/unit_tests/sema/conditional_unresolved_operand_01.cc
@@ -1,3 +1,3 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int x = true ? missing_value : 1; // expected-error {{use of undeclared identifier 'missing_value'}}
diff --git a/tests/unit_tests/sema/const_cast_01.cc b/tests/unit_tests/sema/const_cast_01.cc
index fa093584..8d22e161 100644
--- a/tests/unit_tests/sema/const_cast_01.cc
+++ b/tests/unit_tests/sema/const_cast_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 
 void test_const_cast() {
   int i = 0;
diff --git a/tests/unit_tests/sema/const_overload_01.cc b/tests/unit_tests/sema/const_overload_01.cc
index f7878555..18377ee3 100644
--- a/tests/unit_tests/sema/const_overload_01.cc
+++ b/tests/unit_tests/sema/const_overload_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct K {
   auto begin() const -> int { return 0; }
diff --git a/tests/unit_tests/sema/constant_expression_01.cc b/tests/unit_tests/sema/constant_expression_01.cc
index 14582a70..75dcaaf5 100644
--- a/tests/unit_tests/sema/constant_expression_01.cc
+++ b/tests/unit_tests/sema/constant_expression_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 static_assert('0');
 static_assert(('0'));
diff --git a/tests/unit_tests/sema/constexpr_call_01.cc b/tests/unit_tests/sema/constexpr_call_01.cc
index 2bcb8f40..35b84738 100644
--- a/tests/unit_tests/sema/constexpr_call_01.cc
+++ b/tests/unit_tests/sema/constexpr_call_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 constexpr int add(int a, int b) { return a + b; }
 
diff --git a/tests/unit_tests/sema/constexpr_class_01.cc b/tests/unit_tests/sema/constexpr_class_01.cc
index 6f650b16..30914b9a 100644
--- a/tests/unit_tests/sema/constexpr_class_01.cc
+++ b/tests/unit_tests/sema/constexpr_class_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Point {
   int x;
diff --git a/tests/unit_tests/sema/constexpr_defaulted_ctor_01.cc b/tests/unit_tests/sema/constexpr_defaulted_ctor_01.cc
index 5d5cf282..fcc925da 100644
--- a/tests/unit_tests/sema/constexpr_defaulted_ctor_01.cc
+++ b/tests/unit_tests/sema/constexpr_defaulted_ctor_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct allocator_arg_t {
diff --git a/tests/unit_tests/sema/constexpr_member_01.cc b/tests/unit_tests/sema/constexpr_member_01.cc
index faf46d63..ba8386d3 100644
--- a/tests/unit_tests/sema/constexpr_member_01.cc
+++ b/tests/unit_tests/sema/constexpr_member_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Pair {
   int first;
diff --git a/tests/unit_tests/sema/constexpr_nttp_01.cc b/tests/unit_tests/sema/constexpr_nttp_01.cc
index 80316bab..e2e24671 100644
--- a/tests/unit_tests/sema/constexpr_nttp_01.cc
+++ b/tests/unit_tests/sema/constexpr_nttp_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <int N>
 constexpr int identity() {
diff --git a/tests/unit_tests/sema/constructor_default_args_01.cc b/tests/unit_tests/sema/constructor_default_args_01.cc
index a8e18076..0cb31d8a 100644
--- a/tests/unit_tests/sema/constructor_default_args_01.cc
+++ b/tests/unit_tests/sema/constructor_default_args_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct A {
diff --git a/tests/unit_tests/sema/conversion_op_template_01.cc b/tests/unit_tests/sema/conversion_op_template_01.cc
index b63d3480..776dae83 100644
--- a/tests/unit_tests/sema/conversion_op_template_01.cc
+++ b/tests/unit_tests/sema/conversion_op_template_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Any {
diff --git a/tests/unit_tests/sema/conversion_sequence_01.cc b/tests/unit_tests/sema/conversion_sequence_01.cc
index c4ffa857..d86de208 100644
--- a/tests/unit_tests/sema/conversion_sequence_01.cc
+++ b/tests/unit_tests/sema/conversion_sequence_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Wrapper {
   Wrapper(int x) {}
diff --git a/tests/unit_tests/sema/copy_move_ctor_01.cc b/tests/unit_tests/sema/copy_move_ctor_01.cc
index 968927f6..523c9a7d 100644
--- a/tests/unit_tests/sema/copy_move_ctor_01.cc
+++ b/tests/unit_tests/sema/copy_move_ctor_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Simple {
   int x;
diff --git a/tests/unit_tests/sema/ctor_01.cc b/tests/unit_tests/sema/ctor_01.cc
index b77edb12..bd3f5d55 100644
--- a/tests/unit_tests/sema/ctor_01.cc
+++ b/tests/unit_tests/sema/ctor_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct C {
   struct bar {};
diff --git a/tests/unit_tests/sema/ctor_02.cc b/tests/unit_tests/sema/ctor_02.cc
index e9d81890..842d9b94 100644
--- a/tests/unit_tests/sema/ctor_02.cc
+++ b/tests/unit_tests/sema/ctor_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s --match-full-lines
+// RUN: %cxx -dump-symbols %s | %filecheck %s --match-full-lines
 
 struct X {
   int i;
diff --git a/tests/unit_tests/sema/decltype_01.cc b/tests/unit_tests/sema/decltype_01.cc
index cac0a3f0..82abe8fc 100644
--- a/tests/unit_tests/sema/decltype_01.cc
+++ b/tests/unit_tests/sema/decltype_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 static_assert(__is_null_pointer(decltype(nullptr)));
 
diff --git a/tests/unit_tests/sema/decltype_dependent_alias_01.cc b/tests/unit_tests/sema/decltype_dependent_alias_01.cc
index 66126b2c..5e69046a 100644
--- a/tests/unit_tests/sema/decltype_dependent_alias_01.cc
+++ b/tests/unit_tests/sema/decltype_dependent_alias_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 namespace std {
 inline namespace __1 {
diff --git a/tests/unit_tests/sema/deduction_guide_symbol_01.cc b/tests/unit_tests/sema/deduction_guide_symbol_01.cc
index a79f62bd..845bd0e9 100644
--- a/tests/unit_tests/sema/deduction_guide_symbol_01.cc
+++ b/tests/unit_tests/sema/deduction_guide_symbol_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct List {
diff --git a/tests/unit_tests/sema/deduction_guide_symbol_02.cc b/tests/unit_tests/sema/deduction_guide_symbol_02.cc
index ad3c4549..40c37727 100644
--- a/tests/unit_tests/sema/deduction_guide_symbol_02.cc
+++ b/tests/unit_tests/sema/deduction_guide_symbol_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 struct Outer {
   template <typename T>
diff --git a/tests/unit_tests/sema/default_arguments_redecl_01.cc b/tests/unit_tests/sema/default_arguments_redecl_01.cc
index dd787037..f9521af9 100644
--- a/tests/unit_tests/sema/default_arguments_redecl_01.cc
+++ b/tests/unit_tests/sema/default_arguments_redecl_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 void f(int x = 1);
 
diff --git a/tests/unit_tests/sema/deferred_member_template_01.cc b/tests/unit_tests/sema/deferred_member_template_01.cc
index ba8a891d..93c574f4 100644
--- a/tests/unit_tests/sema/deferred_member_template_01.cc
+++ b/tests/unit_tests/sema/deferred_member_template_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 typedef decltype(sizeof(int)) size_t;
diff --git a/tests/unit_tests/sema/dependent_named_type_specifier_01.cc b/tests/unit_tests/sema/dependent_named_type_specifier_01.cc
index 56ab135f..996704c2 100644
--- a/tests/unit_tests/sema/dependent_named_type_specifier_01.cc
+++ b/tests/unit_tests/sema/dependent_named_type_specifier_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class _Tp, _Tp __v>
diff --git a/tests/unit_tests/sema/dependent_ref_init_01.cc b/tests/unit_tests/sema/dependent_ref_init_01.cc
index fa344588..0954f10b 100644
--- a/tests/unit_tests/sema/dependent_ref_init_01.cc
+++ b/tests/unit_tests/sema/dependent_ref_init_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/empty_pack_01.cc b/tests/unit_tests/sema/empty_pack_01.cc
index 75b67fc0..998a6894 100644
--- a/tests/unit_tests/sema/empty_pack_01.cc
+++ b/tests/unit_tests/sema/empty_pack_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename... Ts>
 constexpr int count(Ts... args) {
diff --git a/tests/unit_tests/sema/enum_c_01.c b/tests/unit_tests/sema/enum_c_01.c
index 1cdc0eea..3f9aa8a4 100644
--- a/tests/unit_tests/sema/enum_c_01.c
+++ b/tests/unit_tests/sema/enum_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols -xc %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols -xc %s | %filecheck %s
 
 enum X {
   A,
diff --git a/tests/unit_tests/sema/enum_underlying_01.cc b/tests/unit_tests/sema/enum_underlying_01.cc
index 8853393e..d17af70e 100644
--- a/tests/unit_tests/sema/enum_underlying_01.cc
+++ b/tests/unit_tests/sema/enum_underlying_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 enum Plain { a = 0, b = 1, c = 5 };
 enum PlainNeg { x = -1, y = 0 };
diff --git a/tests/unit_tests/sema/explicit_spec_after_implicit_01.cc b/tests/unit_tests/sema/explicit_spec_after_implicit_01.cc
index 8a403422..c1391637 100644
--- a/tests/unit_tests/sema/explicit_spec_after_implicit_01.cc
+++ b/tests/unit_tests/sema/explicit_spec_after_implicit_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class _Tp = void>
diff --git a/tests/unit_tests/sema/extern_c_linkage_01.cc b/tests/unit_tests/sema/extern_c_linkage_01.cc
index 4b8c816b..71a4654b 100644
--- a/tests/unit_tests/sema/extern_c_linkage_01.cc
+++ b/tests/unit_tests/sema/extern_c_linkage_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 // Brace form: extern "C" { ... }
 extern "C" {
@@ -28,7 +28,7 @@ struct Widget {
 };
 }
 
-// Redeclare a C-linkage function outside extern "C" —
+// Redeclare a C-linkage function outside extern "C" -
 // the redeclaration should inherit C linkage from the canonical.
 void abort();
 
diff --git a/tests/unit_tests/sema/extern_in_block_func_01.c b/tests/unit_tests/sema/extern_in_block_func_01.c
index f568995b..ecafb17d 100644
--- a/tests/unit_tests/sema/extern_in_block_func_01.c
+++ b/tests/unit_tests/sema/extern_in_block_func_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 void caller() {
diff --git a/tests/unit_tests/sema/extern_in_block_var_01.c b/tests/unit_tests/sema/extern_in_block_var_01.c
index 24300b3c..5b0bc355 100644
--- a/tests/unit_tests/sema/extern_in_block_var_01.c
+++ b/tests/unit_tests/sema/extern_in_block_var_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 void writer() {
diff --git a/tests/unit_tests/sema/extern_in_block_var_02.c b/tests/unit_tests/sema/extern_in_block_var_02.c
index 76849757..e6683848 100644
--- a/tests/unit_tests/sema/extern_in_block_var_02.c
+++ b/tests/unit_tests/sema/extern_in_block_var_02.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 void use_code() {
diff --git a/tests/unit_tests/sema/ferror_limit_01.cc b/tests/unit_tests/sema/ferror_limit_01.cc
index 33304715..02b4d1ec 100644
--- a/tests/unit_tests/sema/ferror_limit_01.cc
+++ b/tests/unit_tests/sema/ferror_limit_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -ferror-limit 2 %s
+// RUN: %cxx -verify -ferror-limit 2 %s
 
 template <int>
 struct S;
diff --git a/tests/unit_tests/sema/for_range_01.cc b/tests/unit_tests/sema/for_range_01.cc
index 5b94f487..9876848a 100644
--- a/tests/unit_tests/sema/for_range_01.cc
+++ b/tests/unit_tests/sema/for_range_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int sum_array() {
   int arr[4] = {1, 2, 3, 4};
diff --git a/tests/unit_tests/sema/friend_decl_01.cc b/tests/unit_tests/sema/friend_decl_01.cc
index 2f5c16bf..7a30ce21 100644
--- a/tests/unit_tests/sema/friend_decl_01.cc
+++ b/tests/unit_tests/sema/friend_decl_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Test: hidden friend function found via ADL
 
diff --git a/tests/unit_tests/sema/friend_decl_02.cc b/tests/unit_tests/sema/friend_decl_02.cc
index baf4f5fd..d8731623 100644
--- a/tests/unit_tests/sema/friend_decl_02.cc
+++ b/tests/unit_tests/sema/friend_decl_02.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Test: friend function redeclared at namespace scope becomes visible
 
diff --git a/tests/unit_tests/sema/friend_decl_03.cc b/tests/unit_tests/sema/friend_decl_03.cc
index f1d11408..5bafb7cb 100644
--- a/tests/unit_tests/sema/friend_decl_03.cc
+++ b/tests/unit_tests/sema/friend_decl_03.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Test: friend class previously declared at namespace scope
 
diff --git a/tests/unit_tests/sema/function_params_01.cc b/tests/unit_tests/sema/function_params_01.cc
index c8910922..8319102b 100644
--- a/tests/unit_tests/sema/function_params_01.cc
+++ b/tests/unit_tests/sema/function_params_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 // clang-format on
 
 struct C {
diff --git a/tests/unit_tests/sema/function_redecl_array_default_arg_01.cc b/tests/unit_tests/sema/function_redecl_array_default_arg_01.cc
index 2d6cbd1f..f0b2d4c5 100644
--- a/tests/unit_tests/sema/function_redecl_array_default_arg_01.cc
+++ b/tests/unit_tests/sema/function_redecl_array_default_arg_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 void g(int a[4] = nullptr);
 
diff --git a/tests/unit_tests/sema/function_redecl_array_param_01.cc b/tests/unit_tests/sema/function_redecl_array_param_01.cc
index 18653391..5e825049 100644
--- a/tests/unit_tests/sema/function_redecl_array_param_01.cc
+++ b/tests/unit_tests/sema/function_redecl_array_param_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 void f(int a[4]);
diff --git a/tests/unit_tests/sema/fwd_class_01.cc b/tests/unit_tests/sema/fwd_class_01.cc
index 1fd5adce..76dff33b 100644
--- a/tests/unit_tests/sema/fwd_class_01.cc
+++ b/tests/unit_tests/sema/fwd_class_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 namespace cxx {
 class BasicBlock;
diff --git a/tests/unit_tests/sema/generic_selection_01.cc b/tests/unit_tests/sema/generic_selection_01.cc
index bf0fa819..f2bb7c73 100644
--- a/tests/unit_tests/sema/generic_selection_01.cc
+++ b/tests/unit_tests/sema/generic_selection_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/if_condition_decl_01.cc b/tests/unit_tests/sema/if_condition_decl_01.cc
index 42c1748a..0da1535d 100644
--- a/tests/unit_tests/sema/if_condition_decl_01.cc
+++ b/tests/unit_tests/sema/if_condition_decl_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Base {
diff --git a/tests/unit_tests/sema/implicit_member_call_01.cc b/tests/unit_tests/sema/implicit_member_call_01.cc
index 20d8fc05..281e13de 100644
--- a/tests/unit_tests/sema/implicit_member_call_01.cc
+++ b/tests/unit_tests/sema/implicit_member_call_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Counter {
diff --git a/tests/unit_tests/sema/implicit_special_members_01.cc b/tests/unit_tests/sema/implicit_special_members_01.cc
index ca6868e7..a94c3eba 100644
--- a/tests/unit_tests/sema/implicit_special_members_01.cc
+++ b/tests/unit_tests/sema/implicit_special_members_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s --match-full-lines
+// RUN: %cxx -dump-symbols %s | %filecheck %s --match-full-lines
 
 struct Pod {
   int x;
diff --git a/tests/unit_tests/sema/incr_01.cc b/tests/unit_tests/sema/incr_01.cc
index 41e5f784..47b8bf98 100644
--- a/tests/unit_tests/sema/incr_01.cc
+++ b/tests/unit_tests/sema/incr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto main() -> int {
   char c{};
diff --git a/tests/unit_tests/sema/incr_c_01.c b/tests/unit_tests/sema/incr_c_01.c
index 1a018f39..88bc56a4 100644
--- a/tests/unit_tests/sema/incr_c_01.c
+++ b/tests/unit_tests/sema/incr_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -xc %s
+// RUN: %cxx -verify -xc %s
 
 enum E { a, b, c };
 
diff --git a/tests/unit_tests/sema/indirect_goto_c_01.c b/tests/unit_tests/sema/indirect_goto_c_01.c
index ee23b87a..55af24c6 100644
--- a/tests/unit_tests/sema/indirect_goto_c_01.c
+++ b/tests/unit_tests/sema/indirect_goto_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int main() {
   void* target = 0;
diff --git a/tests/unit_tests/sema/init_anon_union_struct_01.c b/tests/unit_tests/sema/init_anon_union_struct_01.c
index 9951c088..6d491f8d 100644
--- a/tests/unit_tests/sema/init_anon_union_struct_01.c
+++ b/tests/unit_tests/sema/init_anon_union_struct_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct S1 {
diff --git a/tests/unit_tests/sema/init_char_array_from_ints_01.c b/tests/unit_tests/sema/init_char_array_from_ints_01.c
index bf9464d1..9faae86d 100644
--- a/tests/unit_tests/sema/init_char_array_from_ints_01.c
+++ b/tests/unit_tests/sema/init_char_array_from_ints_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 #define tkgt 1
 #define tkappend 2
diff --git a/tests/unit_tests/sema/init_class_construction_01.cc b/tests/unit_tests/sema/init_class_construction_01.cc
index b8b63c47..a1c40732 100644
--- a/tests/unit_tests/sema/init_class_construction_01.cc
+++ b/tests/unit_tests/sema/init_class_construction_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Point {
   int x;
diff --git a/tests/unit_tests/sema/init_designated_01.cc b/tests/unit_tests/sema/init_designated_01.cc
index 62a6c3e5..bf92098d 100644
--- a/tests/unit_tests/sema/init_designated_01.cc
+++ b/tests/unit_tests/sema/init_designated_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Point {
   int x;
diff --git a/tests/unit_tests/sema/init_errors_01.cc b/tests/unit_tests/sema/init_errors_01.cc
index db92dd4c..3d9dc055 100644
--- a/tests/unit_tests/sema/init_errors_01.cc
+++ b/tests/unit_tests/sema/init_errors_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/init_member_char_array_string_01.cc b/tests/unit_tests/sema/init_member_char_array_string_01.cc
index 8cfc9204..79aa580a 100644
--- a/tests/unit_tests/sema/init_member_char_array_string_01.cc
+++ b/tests/unit_tests/sema/init_member_char_array_string_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Token {
   int id;
diff --git a/tests/unit_tests/sema/init_narrowing_01.cc b/tests/unit_tests/sema/init_narrowing_01.cc
index e47eece9..432f0ec3 100644
--- a/tests/unit_tests/sema/init_narrowing_01.cc
+++ b/tests/unit_tests/sema/init_narrowing_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/init_narrowing_no_warning_01.cc b/tests/unit_tests/sema/init_narrowing_no_warning_01.cc
index aaade8b3..948378ec 100644
--- a/tests/unit_tests/sema/init_narrowing_no_warning_01.cc
+++ b/tests/unit_tests/sema/init_narrowing_no_warning_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct S {
diff --git a/tests/unit_tests/sema/init_paren_01.cc b/tests/unit_tests/sema/init_paren_01.cc
index abe432e7..a66c8ba7 100644
--- a/tests/unit_tests/sema/init_paren_01.cc
+++ b/tests/unit_tests/sema/init_paren_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 void test_paren_initialization() {
diff --git a/tests/unit_tests/sema/init_reference_binding_01.cc b/tests/unit_tests/sema/init_reference_binding_01.cc
index c4d093a7..db63d79c 100644
--- a/tests/unit_tests/sema/init_reference_binding_01.cc
+++ b/tests/unit_tests/sema/init_reference_binding_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int main() {
   // expected-error@+1 {{invalid initialization of reference of type 'int&' from expression of type 'int'}}
diff --git a/tests/unit_tests/sema/init_reference_valid_01.cc b/tests/unit_tests/sema/init_reference_valid_01.cc
index e80b4765..e1b40130 100644
--- a/tests/unit_tests/sema/init_reference_valid_01.cc
+++ b/tests/unit_tests/sema/init_reference_valid_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 int main() {
diff --git a/tests/unit_tests/sema/init_struct_01.cc b/tests/unit_tests/sema/init_struct_01.cc
index e4a48512..525d5bc8 100644
--- a/tests/unit_tests/sema/init_struct_01.cc
+++ b/tests/unit_tests/sema/init_struct_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Point {
   int x;
diff --git a/tests/unit_tests/sema/initializer_list_01.cc b/tests/unit_tests/sema/initializer_list_01.cc
index becff4ee..60fd63e1 100644
--- a/tests/unit_tests/sema/initializer_list_01.cc
+++ b/tests/unit_tests/sema/initializer_list_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 #include <initializer_list>
diff --git a/tests/unit_tests/sema/injected_class_name_01.cc b/tests/unit_tests/sema/injected_class_name_01.cc
index 25b89d35..f07cce65 100644
--- a/tests/unit_tests/sema/injected_class_name_01.cc
+++ b/tests/unit_tests/sema/injected_class_name_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 struct Foo {
   Foo* self() { return this; }
diff --git a/tests/unit_tests/sema/int128_arith_01.cc b/tests/unit_tests/sema/int128_arith_01.cc
index fdcecf6c..8c3112a4 100644
--- a/tests/unit_tests/sema/int128_arith_01.cc
+++ b/tests/unit_tests/sema/int128_arith_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 // expected-no-diagnostics
 
 int main() {
diff --git a/tests/unit_tests/sema/is_base_of_01.cc b/tests/unit_tests/sema/is_base_of_01.cc
index 0481efa7..551c8668 100644
--- a/tests/unit_tests/sema/is_base_of_01.cc
+++ b/tests/unit_tests/sema/is_base_of_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Base;
 struct OtherBase;
diff --git a/tests/unit_tests/sema/is_constructible_01.cc b/tests/unit_tests/sema/is_constructible_01.cc
index d8036980..82856ea8 100644
--- a/tests/unit_tests/sema/is_constructible_01.cc
+++ b/tests/unit_tests/sema/is_constructible_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <class T, T v>
 struct integral_constant {
diff --git a/tests/unit_tests/sema/is_convertible_01.cc b/tests/unit_tests/sema/is_convertible_01.cc
index 1e59bcd3..757d94c3 100644
--- a/tests/unit_tests/sema/is_convertible_01.cc
+++ b/tests/unit_tests/sema/is_convertible_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // expected-no-diagnostics
 
diff --git a/tests/unit_tests/sema/is_final_01.cc b/tests/unit_tests/sema/is_final_01.cc
index 7bd85fcc..84b09883 100644
--- a/tests/unit_tests/sema/is_final_01.cc
+++ b/tests/unit_tests/sema/is_final_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct C {};
 
diff --git a/tests/unit_tests/sema/lazy_instantiation_01.cc b/tests/unit_tests/sema/lazy_instantiation_01.cc
index 93ef0aa0..d7d96354 100644
--- a/tests/unit_tests/sema/lazy_instantiation_01.cc
+++ b/tests/unit_tests/sema/lazy_instantiation_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/sema/lazy_instantiation_02.cc b/tests/unit_tests/sema/lazy_instantiation_02.cc
index 1d134efb..558029a9 100644
--- a/tests/unit_tests/sema/lazy_instantiation_02.cc
+++ b/tests/unit_tests/sema/lazy_instantiation_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/sema/lazy_instantiation_03.cc b/tests/unit_tests/sema/lazy_instantiation_03.cc
index bd5d335f..110b056d 100644
--- a/tests/unit_tests/sema/lazy_instantiation_03.cc
+++ b/tests/unit_tests/sema/lazy_instantiation_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/sema/lazy_instantiation_04.cc b/tests/unit_tests/sema/lazy_instantiation_04.cc
index 72b6acf0..a1567a35 100644
--- a/tests/unit_tests/sema/lazy_instantiation_04.cc
+++ b/tests/unit_tests/sema/lazy_instantiation_04.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct Base {
diff --git a/tests/unit_tests/sema/lazy_instantiation_05.cc b/tests/unit_tests/sema/lazy_instantiation_05.cc
index 26f6d84f..7da62556 100644
--- a/tests/unit_tests/sema/lazy_instantiation_05.cc
+++ b/tests/unit_tests/sema/lazy_instantiation_05.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/sema/lazy_instantiation_06.cc b/tests/unit_tests/sema/lazy_instantiation_06.cc
index 846c526f..753d3c72 100644
--- a/tests/unit_tests/sema/lazy_instantiation_06.cc
+++ b/tests/unit_tests/sema/lazy_instantiation_06.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/sema/lazy_instantiation_07.cc b/tests/unit_tests/sema/lazy_instantiation_07.cc
index 47513351..e1c02f07 100644
--- a/tests/unit_tests/sema/lazy_instantiation_07.cc
+++ b/tests/unit_tests/sema/lazy_instantiation_07.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/sema/logical_neg_01.cc b/tests/unit_tests/sema/logical_neg_01.cc
index 836e94c8..e84b8e35 100644
--- a/tests/unit_tests/sema/logical_neg_01.cc
+++ b/tests/unit_tests/sema/logical_neg_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto main() -> int {
   static_assert(__is_same(decltype(!true), bool));
diff --git a/tests/unit_tests/sema/lookup_anonymous_member_01.cc b/tests/unit_tests/sema/lookup_anonymous_member_01.cc
index a075c632..262166fb 100644
--- a/tests/unit_tests/sema/lookup_anonymous_member_01.cc
+++ b/tests/unit_tests/sema/lookup_anonymous_member_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Anonymous struct/union member lookup: members of anonymous
 // structs/unions should be found as if they were direct members.
diff --git a/tests/unit_tests/sema/lookup_base_class_01.cc b/tests/unit_tests/sema/lookup_base_class_01.cc
index 0acd8886..10107918 100644
--- a/tests/unit_tests/sema/lookup_base_class_01.cc
+++ b/tests/unit_tests/sema/lookup_base_class_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Base class member lookup: names inherited from base classes
 // should be found by unqualified lookup in derived classes.
diff --git a/tests/unit_tests/sema/lookup_qualified_01.cc b/tests/unit_tests/sema/lookup_qualified_01.cc
index bc21b109..42b0e867 100644
--- a/tests/unit_tests/sema/lookup_qualified_01.cc
+++ b/tests/unit_tests/sema/lookup_qualified_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Qualified lookup through nested name specifiers with multiple levels.
 
diff --git a/tests/unit_tests/sema/lookup_type_alias_01.cc b/tests/unit_tests/sema/lookup_type_alias_01.cc
index aeb9b08f..6b9d68ad 100644
--- a/tests/unit_tests/sema/lookup_type_alias_01.cc
+++ b/tests/unit_tests/sema/lookup_type_alias_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Type alias qualified lookup: looking up types through
 // type aliases and using declarations used as scope qualifiers.
diff --git a/tests/unit_tests/sema/lookup_using_directive_01.cc b/tests/unit_tests/sema/lookup_using_directive_01.cc
index 4bae11d8..05d0a6d0 100644
--- a/tests/unit_tests/sema/lookup_using_directive_01.cc
+++ b/tests/unit_tests/sema/lookup_using_directive_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Using-directive lookup: names made visible by using-directives
 // should be found by unqualified lookup.
diff --git a/tests/unit_tests/sema/make_integer_seq_01.cc b/tests/unit_tests/sema/make_integer_seq_01.cc
index 338ac748..09a38b83 100644
--- a/tests/unit_tests/sema/make_integer_seq_01.cc
+++ b/tests/unit_tests/sema/make_integer_seq_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // expected-no-diagnostics
 
diff --git a/tests/unit_tests/sema/mem_init.cc b/tests/unit_tests/sema/mem_init.cc
index 91a52e2a..1146e1f3 100644
--- a/tests/unit_tests/sema/mem_init.cc
+++ b/tests/unit_tests/sema/mem_init.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 extern "C" {
 int printf(const char* format, ...);
diff --git a/tests/unit_tests/sema/member_access_01.cc b/tests/unit_tests/sema/member_access_01.cc
index c7984f7d..50501404 100644
--- a/tests/unit_tests/sema/member_access_01.cc
+++ b/tests/unit_tests/sema/member_access_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/member_access_02.cc b/tests/unit_tests/sema/member_access_02.cc
index 01bc140c..dfb69c1c 100644
--- a/tests/unit_tests/sema/member_access_02.cc
+++ b/tests/unit_tests/sema/member_access_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -freport-missing-types %s
+// RUN: %cxx -verify -freport-missing-types %s
 
 struct X {
   enum E { kValue = 0 };
diff --git a/tests/unit_tests/sema/member_access_03.cc b/tests/unit_tests/sema/member_access_03.cc
index 1168a43a..bcd008ae 100644
--- a/tests/unit_tests/sema/member_access_03.cc
+++ b/tests/unit_tests/sema/member_access_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -freport-missing-types %s
+// RUN: %cxx -verify -freport-missing-types %s
 
 struct X {
   int a[1];
diff --git a/tests/unit_tests/sema/member_access_missing_01.cc b/tests/unit_tests/sema/member_access_missing_01.cc
index cd06c704..b0985255 100644
--- a/tests/unit_tests/sema/member_access_missing_01.cc
+++ b/tests/unit_tests/sema/member_access_missing_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {};
 
diff --git a/tests/unit_tests/sema/member_access_on_non_class_in_template.cc b/tests/unit_tests/sema/member_access_on_non_class_in_template.cc
index 04563b4d..894c8bbc 100644
--- a/tests/unit_tests/sema/member_access_on_non_class_in_template.cc
+++ b/tests/unit_tests/sema/member_access_on_non_class_in_template.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 void g(T t) {
diff --git a/tests/unit_tests/sema/memory_ratio_dependent_01.cc b/tests/unit_tests/sema/memory_ratio_dependent_01.cc
index a933ec14..ffed5ada 100644
--- a/tests/unit_tests/sema/memory_ratio_dependent_01.cc
+++ b/tests/unit_tests/sema/memory_ratio_dependent_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <long N, long D>
 struct ratio {
diff --git a/tests/unit_tests/sema/memory_ratio_nns_substitution_01.cc b/tests/unit_tests/sema/memory_ratio_nns_substitution_01.cc
index 133da416..8767447d 100644
--- a/tests/unit_tests/sema/memory_ratio_nns_substitution_01.cc
+++ b/tests/unit_tests/sema/memory_ratio_nns_substitution_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <long _Num, long _Den = 1>
 struct ratio {
diff --git a/tests/unit_tests/sema/nested_class_member_access_01.cc b/tests/unit_tests/sema/nested_class_member_access_01.cc
index df358a85..92f0dc2d 100644
--- a/tests/unit_tests/sema/nested_class_member_access_01.cc
+++ b/tests/unit_tests/sema/nested_class_member_access_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -c %s 2>&1 | %filecheck %s --allow-empty
+// RUN: %cxx -c %s 2>&1 | %filecheck %s --allow-empty
 // CHECK-NOT: error
 
 struct ConstValue {
diff --git a/tests/unit_tests/sema/noexcept_expr_01.cc b/tests/unit_tests/sema/noexcept_expr_01.cc
index 5dd9270b..6d10e118 100644
--- a/tests/unit_tests/sema/noexcept_expr_01.cc
+++ b/tests/unit_tests/sema/noexcept_expr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Literals and arithmetic - never throw
 static_assert(noexcept(1 + 2));
diff --git a/tests/unit_tests/sema/noexcept_expr_02.cc b/tests/unit_tests/sema/noexcept_expr_02.cc
index e62d2a8e..198e509d 100644
--- a/tests/unit_tests/sema/noexcept_expr_02.cc
+++ b/tests/unit_tests/sema/noexcept_expr_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Variable template using noexcept as constexpr bool
 template <typename T>
diff --git a/tests/unit_tests/sema/noexcept_expr_03.cc b/tests/unit_tests/sema/noexcept_expr_03.cc
index 628a857a..b3eda61e 100644
--- a/tests/unit_tests/sema/noexcept_expr_03.cc
+++ b/tests/unit_tests/sema/noexcept_expr_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct WithUnary {
   WithUnary operator-() noexcept;
diff --git a/tests/unit_tests/sema/noexcept_expr_04.cc b/tests/unit_tests/sema/noexcept_expr_04.cc
index 7a55310a..3891fcef 100644
--- a/tests/unit_tests/sema/noexcept_expr_04.cc
+++ b/tests/unit_tests/sema/noexcept_expr_04.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct S {
   S& operator+=(const S&) noexcept;
diff --git a/tests/unit_tests/sema/noexcept_specifier_expr_01.cc b/tests/unit_tests/sema/noexcept_specifier_expr_01.cc
index f5921108..1f7228d3 100644
--- a/tests/unit_tests/sema/noexcept_specifier_expr_01.cc
+++ b/tests/unit_tests/sema/noexcept_specifier_expr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 void f1() noexcept(true);
 static_assert(noexcept(f1()));
diff --git a/tests/unit_tests/sema/null_pointer_constant_01.cc b/tests/unit_tests/sema/null_pointer_constant_01.cc
index a4c099f0..5e6b986e 100644
--- a/tests/unit_tests/sema/null_pointer_constant_01.cc
+++ b/tests/unit_tests/sema/null_pointer_constant_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 extern "C" void abort();
 
diff --git a/tests/unit_tests/sema/ool_template_member_no_fcheck_01.cc b/tests/unit_tests/sema/ool_template_member_no_fcheck_01.cc
index 68e2436a..27fb3777 100644
--- a/tests/unit_tests/sema/ool_template_member_no_fcheck_01.cc
+++ b/tests/unit_tests/sema/ool_template_member_no_fcheck_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify %s
+// RUN: %cxx -fno-check -verify %s
 
 template <typename T>
 struct Box {
diff --git a/tests/unit_tests/sema/operator_overload_ambiguous_01.cc b/tests/unit_tests/sema/operator_overload_ambiguous_01.cc
index 6c1f7cb1..23cd0f17 100644
--- a/tests/unit_tests/sema/operator_overload_ambiguous_01.cc
+++ b/tests/unit_tests/sema/operator_overload_ambiguous_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct A {};
 
diff --git a/tests/unit_tests/sema/operator_overload_arrow_01.cc b/tests/unit_tests/sema/operator_overload_arrow_01.cc
index 92fa3338..c8315e12 100644
--- a/tests/unit_tests/sema/operator_overload_arrow_01.cc
+++ b/tests/unit_tests/sema/operator_overload_arrow_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Ptr {
diff --git a/tests/unit_tests/sema/operator_overload_assignment_01.cc b/tests/unit_tests/sema/operator_overload_assignment_01.cc
index 62c4a1c7..98122d62 100644
--- a/tests/unit_tests/sema/operator_overload_assignment_01.cc
+++ b/tests/unit_tests/sema/operator_overload_assignment_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Box {
diff --git a/tests/unit_tests/sema/operator_overload_binary_01.cc b/tests/unit_tests/sema/operator_overload_binary_01.cc
index abbbdb10..6a3efd33 100644
--- a/tests/unit_tests/sema/operator_overload_binary_01.cc
+++ b/tests/unit_tests/sema/operator_overload_binary_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Vec {
diff --git a/tests/unit_tests/sema/operator_overload_call_01.cc b/tests/unit_tests/sema/operator_overload_call_01.cc
index 2a935983..6e88c757 100644
--- a/tests/unit_tests/sema/operator_overload_call_01.cc
+++ b/tests/unit_tests/sema/operator_overload_call_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Adder {
diff --git a/tests/unit_tests/sema/operator_overload_call_02.cc b/tests/unit_tests/sema/operator_overload_call_02.cc
index 4dd73e4c..628a46d5 100644
--- a/tests/unit_tests/sema/operator_overload_call_02.cc
+++ b/tests/unit_tests/sema/operator_overload_call_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct G {
diff --git a/tests/unit_tests/sema/operator_overload_call_blocker_01.cc b/tests/unit_tests/sema/operator_overload_call_blocker_01.cc
index 9c0355fc..6b149298 100644
--- a/tests/unit_tests/sema/operator_overload_call_blocker_01.cc
+++ b/tests/unit_tests/sema/operator_overload_call_blocker_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct F {
diff --git a/tests/unit_tests/sema/operator_overload_compound_assignment_01.cc b/tests/unit_tests/sema/operator_overload_compound_assignment_01.cc
index e6357ed6..8a42fbb9 100644
--- a/tests/unit_tests/sema/operator_overload_compound_assignment_01.cc
+++ b/tests/unit_tests/sema/operator_overload_compound_assignment_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Sum {
diff --git a/tests/unit_tests/sema/operator_overload_conversion_rank_01.cc b/tests/unit_tests/sema/operator_overload_conversion_rank_01.cc
index 0979c847..bd6f6d1c 100644
--- a/tests/unit_tests/sema/operator_overload_conversion_rank_01.cc
+++ b/tests/unit_tests/sema/operator_overload_conversion_rank_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct A {};
diff --git a/tests/unit_tests/sema/operator_overload_nullptr_ambiguous_01.cc b/tests/unit_tests/sema/operator_overload_nullptr_ambiguous_01.cc
index b071ffcf..c5138534 100644
--- a/tests/unit_tests/sema/operator_overload_nullptr_ambiguous_01.cc
+++ b/tests/unit_tests/sema/operator_overload_nullptr_ambiguous_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct P {};
 
diff --git a/tests/unit_tests/sema/operator_overload_postfix_01.cc b/tests/unit_tests/sema/operator_overload_postfix_01.cc
index 22cf0754..43a8013e 100644
--- a/tests/unit_tests/sema/operator_overload_postfix_01.cc
+++ b/tests/unit_tests/sema/operator_overload_postfix_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Counter {
diff --git a/tests/unit_tests/sema/operator_overload_shift_01.cc b/tests/unit_tests/sema/operator_overload_shift_01.cc
index 15ed9d8b..d746e470 100644
--- a/tests/unit_tests/sema/operator_overload_shift_01.cc
+++ b/tests/unit_tests/sema/operator_overload_shift_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Stream {};
diff --git a/tests/unit_tests/sema/operator_overload_subscript_01.cc b/tests/unit_tests/sema/operator_overload_subscript_01.cc
index 4864042d..8961c06d 100644
--- a/tests/unit_tests/sema/operator_overload_subscript_01.cc
+++ b/tests/unit_tests/sema/operator_overload_subscript_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Buffer {
   int data[4];
diff --git a/tests/unit_tests/sema/operator_overload_unary_01.cc b/tests/unit_tests/sema/operator_overload_unary_01.cc
index d73d1870..c781a65c 100644
--- a/tests/unit_tests/sema/operator_overload_unary_01.cc
+++ b/tests/unit_tests/sema/operator_overload_unary_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Num {
diff --git a/tests/unit_tests/sema/overload_ellipsis_01.cc b/tests/unit_tests/sema/overload_ellipsis_01.cc
index d2298a73..55d08b5e 100644
--- a/tests/unit_tests/sema/overload_ellipsis_01.cc
+++ b/tests/unit_tests/sema/overload_ellipsis_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 int f_exact(int x) { return x; }
diff --git a/tests/unit_tests/sema/overload_qual_rank_01.cc b/tests/unit_tests/sema/overload_qual_rank_01.cc
index aee057a9..a1c22053 100644
--- a/tests/unit_tests/sema/overload_qual_rank_01.cc
+++ b/tests/unit_tests/sema/overload_qual_rank_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 namespace prefer_exact_over_qual {
diff --git a/tests/unit_tests/sema/overload_resolution_01.cc b/tests/unit_tests/sema/overload_resolution_01.cc
index 8b846ce7..0e122083 100644
--- a/tests/unit_tests/sema/overload_resolution_01.cc
+++ b/tests/unit_tests/sema/overload_resolution_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 namespace overload_resolution_basic {
diff --git a/tests/unit_tests/sema/pack_index_01.cc b/tests/unit_tests/sema/pack_index_01.cc
index 013f3688..c41eceb2 100644
--- a/tests/unit_tests/sema/pack_index_01.cc
+++ b/tests/unit_tests/sema/pack_index_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 // expected-no-diagnostics
 
 template <int i>
diff --git a/tests/unit_tests/sema/pragma_pack_01.c b/tests/unit_tests/sema/pragma_pack_01.c
index 3e14edff..38c953bc 100644
--- a/tests/unit_tests/sema/pragma_pack_01.c
+++ b/tests/unit_tests/sema/pragma_pack_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -fcheck %s
+// RUN: %cxx -toolchain macos %s
 
 #pragma pack(push, 1)
 
diff --git a/tests/unit_tests/sema/ref_binding_cv_overload_01.cc b/tests/unit_tests/sema/ref_binding_cv_overload_01.cc
index 22917daf..c658a8aa 100644
--- a/tests/unit_tests/sema/ref_binding_cv_overload_01.cc
+++ b/tests/unit_tests/sema/ref_binding_cv_overload_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct L {};
diff --git a/tests/unit_tests/sema/ref_binding_forwarding_01.cc b/tests/unit_tests/sema/ref_binding_forwarding_01.cc
index 6d5abefb..50a75910 100644
--- a/tests/unit_tests/sema/ref_binding_forwarding_01.cc
+++ b/tests/unit_tests/sema/ref_binding_forwarding_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct L {};
diff --git a/tests/unit_tests/sema/ref_binding_nonconst_reject_01.cc b/tests/unit_tests/sema/ref_binding_nonconst_reject_01.cc
index b484bc8c..fa5e3f72 100644
--- a/tests/unit_tests/sema/ref_binding_nonconst_reject_01.cc
+++ b/tests/unit_tests/sema/ref_binding_nonconst_reject_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 void accept(int&);
 
diff --git a/tests/unit_tests/sema/reflect_01.cc b/tests/unit_tests/sema/reflect_01.cc
index d59aa3de..4b576b2f 100644
--- a/tests/unit_tests/sema/reflect_01.cc
+++ b/tests/unit_tests/sema/reflect_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 namespace std {
 namespace meta {
diff --git a/tests/unit_tests/sema/reflect_unresolved_operand_01.cc b/tests/unit_tests/sema/reflect_unresolved_operand_01.cc
index 9305aa40..fc3cc5fc 100644
--- a/tests/unit_tests/sema/reflect_unresolved_operand_01.cc
+++ b/tests/unit_tests/sema/reflect_unresolved_operand_01.cc
@@ -1,3 +1,3 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto r = ^^missing_symbol; // expected-error {{use of undeclared identifier 'missing_symbol'}}
diff --git a/tests/unit_tests/sema/reinterpret_cast_01.cc b/tests/unit_tests/sema/reinterpret_cast_01.cc
index c5267b65..8da8f3f5 100644
--- a/tests/unit_tests/sema/reinterpret_cast_01.cc
+++ b/tests/unit_tests/sema/reinterpret_cast_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct A {
   int x;
diff --git a/tests/unit_tests/sema/requires_clause_overload_01.cc b/tests/unit_tests/sema/requires_clause_overload_01.cc
index 9091ef22..10484af6 100644
--- a/tests/unit_tests/sema/requires_clause_overload_01.cc
+++ b/tests/unit_tests/sema/requires_clause_overload_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <bool x>
diff --git a/tests/unit_tests/sema/sizeof_01.cc b/tests/unit_tests/sema/sizeof_01.cc
index 84118408..82962aa6 100644
--- a/tests/unit_tests/sema/sizeof_01.cc
+++ b/tests/unit_tests/sema/sizeof_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain wasm32 -verify -fcheck %s
+// RUN: %cxx -toolchain wasm32 -verify %s
 
 static_assert(sizeof(bool) == 1);
 static_assert(sizeof(signed char) == 1);
diff --git a/tests/unit_tests/sema/sizeof_array_deref_01.c b/tests/unit_tests/sema/sizeof_array_deref_01.c
index 0584d37c..8749780d 100644
--- a/tests/unit_tests/sema/sizeof_array_deref_01.c
+++ b/tests/unit_tests/sema/sizeof_array_deref_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 typedef int elem_t;
 elem_t arr[10];
diff --git a/tests/unit_tests/sema/splice_invalid_expression_01.cc b/tests/unit_tests/sema/splice_invalid_expression_01.cc
index ed8a41d5..5848848f 100644
--- a/tests/unit_tests/sema/splice_invalid_expression_01.cc
+++ b/tests/unit_tests/sema/splice_invalid_expression_01.cc
@@ -1,3 +1,3 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto v = [:missing_value:]; // expected-error {{invalid splicer expression}}
diff --git a/tests/unit_tests/sema/standard_conversion_01.cc b/tests/unit_tests/sema/standard_conversion_01.cc
index dc76b855..ca7ec117 100644
--- a/tests/unit_tests/sema/standard_conversion_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_arith_01.cc b/tests/unit_tests/sema/standard_conversion_arith_01.cc
index 6fa9ab79..8ebdba79 100644
--- a/tests/unit_tests/sema/standard_conversion_arith_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_arith_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_bool_01.cc b/tests/unit_tests/sema/standard_conversion_bool_01.cc
index 1d6963b1..dff3c736 100644
--- a/tests/unit_tests/sema/standard_conversion_bool_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_bool_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_fctptr_01.cc b/tests/unit_tests/sema/standard_conversion_fctptr_01.cc
index b76e6268..429d4aed 100644
--- a/tests/unit_tests/sema/standard_conversion_fctptr_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_fctptr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_fpint_01.cc b/tests/unit_tests/sema/standard_conversion_fpint_01.cc
index fbd9a9f7..86d4b111 100644
--- a/tests/unit_tests/sema/standard_conversion_fpint_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_fpint_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_integral_01.cc b/tests/unit_tests/sema/standard_conversion_integral_01.cc
index 73ea4e5a..af1bedc9 100644
--- a/tests/unit_tests/sema/standard_conversion_integral_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_integral_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_mem_01.cc b/tests/unit_tests/sema/standard_conversion_mem_01.cc
index 714c69a6..9ed9a4db 100644
--- a/tests/unit_tests/sema/standard_conversion_mem_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_mem_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_prom_01.cc b/tests/unit_tests/sema/standard_conversion_prom_01.cc
index c743ab32..1ec5d13e 100644
--- a/tests/unit_tests/sema/standard_conversion_prom_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_prom_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_ptr_01.cc b/tests/unit_tests/sema/standard_conversion_ptr_01.cc
index b39f1712..b1a5046f 100644
--- a/tests/unit_tests/sema/standard_conversion_ptr_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_ptr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/standard_conversion_qual_01.cc b/tests/unit_tests/sema/standard_conversion_qual_01.cc
index 26f1e4a4..097fc6e3 100644
--- a/tests/unit_tests/sema/standard_conversion_qual_01.cc
+++ b/tests/unit_tests/sema/standard_conversion_qual_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/static_assert_01.cc b/tests/unit_tests/sema/static_assert_01.cc
index 4a5cf0c8..db98f170 100644
--- a/tests/unit_tests/sema/static_assert_01.cc
+++ b/tests/unit_tests/sema/static_assert_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 static_assert(true);
 static_assert('a');
diff --git a/tests/unit_tests/sema/static_cast_01.cc b/tests/unit_tests/sema/static_cast_01.cc
index cfce9969..9b0d9566 100644
--- a/tests/unit_tests/sema/static_cast_01.cc
+++ b/tests/unit_tests/sema/static_cast_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct X {};
 
diff --git a/tests/unit_tests/sema/static_cast_02.cc b/tests/unit_tests/sema/static_cast_02.cc
index fafd0b22..483619c0 100644
--- a/tests/unit_tests/sema/static_cast_02.cc
+++ b/tests/unit_tests/sema/static_cast_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -freport-missing-types  %s
+// RUN: %cxx -verify -freport-missing-types  %s
 
 // clang-format off
 
diff --git a/tests/unit_tests/sema/static_cast_03.cc b/tests/unit_tests/sema/static_cast_03.cc
index 71823413..a5d7797f 100644
--- a/tests/unit_tests/sema/static_cast_03.cc
+++ b/tests/unit_tests/sema/static_cast_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct B {
   int x;
diff --git a/tests/unit_tests/sema/string_literals_01.cc b/tests/unit_tests/sema/string_literals_01.cc
index cd33ac10..2bd3721d 100644
--- a/tests/unit_tests/sema/string_literals_01.cc
+++ b/tests/unit_tests/sema/string_literals_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 static_assert(__is_same(decltype("hello"), const char (&)[6]));
 static_assert(__is_same(decltype(""), const char (&)[1]));
diff --git a/tests/unit_tests/sema/string_literals_02.cc b/tests/unit_tests/sema/string_literals_02.cc
index 3612e4a6..5d96dba3 100644
--- a/tests/unit_tests/sema/string_literals_02.cc
+++ b/tests/unit_tests/sema/string_literals_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 static_assert(sizeof("\n") == 2);
 static_assert(sizeof("\t") == 2);
diff --git a/tests/unit_tests/sema/struct_c_01.c b/tests/unit_tests/sema/struct_c_01.c
index 3c72f061..73a584df 100644
--- a/tests/unit_tests/sema/struct_c_01.c
+++ b/tests/unit_tests/sema/struct_c_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols -xc %s | %filecheck %s --match-full-lines
+// RUN: %cxx -dump-symbols -xc %s | %filecheck %s --match-full-lines
 
 enum E {
   v,
diff --git a/tests/unit_tests/sema/substitution_pack_with_defaults_01.cc b/tests/unit_tests/sema/substitution_pack_with_defaults_01.cc
index b97e21f2..c21d0d57 100644
--- a/tests/unit_tests/sema/substitution_pack_with_defaults_01.cc
+++ b/tests/unit_tests/sema/substitution_pack_with_defaults_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 // Class template with all-defaulted parameters.
diff --git a/tests/unit_tests/sema/substitution_trailing_after_pack_01.cc b/tests/unit_tests/sema/substitution_trailing_after_pack_01.cc
index 0a9c0cea..84b8629c 100644
--- a/tests/unit_tests/sema/substitution_trailing_after_pack_01.cc
+++ b/tests/unit_tests/sema/substitution_trailing_after_pack_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 // Variadic function template with deduced trailing parameter.
diff --git a/tests/unit_tests/sema/subtraction_01.cc b/tests/unit_tests/sema/subtraction_01.cc
index 80706061..2fc65849 100644
--- a/tests/unit_tests/sema/subtraction_01.cc
+++ b/tests/unit_tests/sema/subtraction_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto main() -> int {
   char* p;
diff --git a/tests/unit_tests/sema/switch_condition_decl_01.cc b/tests/unit_tests/sema/switch_condition_decl_01.cc
index 8120e985..bad62849 100644
--- a/tests/unit_tests/sema/switch_condition_decl_01.cc
+++ b/tests/unit_tests/sema/switch_condition_decl_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 int compute() { return 2; }
diff --git a/tests/unit_tests/sema/template_alias_01.cc b/tests/unit_tests/sema/template_alias_01.cc
index 7ca15e29..6bef4fa1 100644
--- a/tests/unit_tests/sema/template_alias_01.cc
+++ b/tests/unit_tests/sema/template_alias_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 using Pointer = T*;
diff --git a/tests/unit_tests/sema/template_alias_02.cc b/tests/unit_tests/sema/template_alias_02.cc
index a5653cd6..1dc71e49 100644
--- a/tests/unit_tests/sema/template_alias_02.cc
+++ b/tests/unit_tests/sema/template_alias_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 template <typename Key, typename Value>
 struct HashMap {
diff --git a/tests/unit_tests/sema/template_base_type_param_01.cc b/tests/unit_tests/sema/template_base_type_param_01.cc
index 05afe6df..0fb0fc29 100644
--- a/tests/unit_tests/sema/template_base_type_param_01.cc
+++ b/tests/unit_tests/sema/template_base_type_param_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <typename _Tp>
diff --git a/tests/unit_tests/sema/template_base_type_param_02.cc b/tests/unit_tests/sema/template_base_type_param_02.cc
index 3acb6629..70e92ad5 100644
--- a/tests/unit_tests/sema/template_base_type_param_02.cc
+++ b/tests/unit_tests/sema/template_base_type_param_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 // expected-no-diagnostics
 
 // Template class with explicit type parameter base - instantiation test.
diff --git a/tests/unit_tests/sema/template_base_type_param_03.cc b/tests/unit_tests/sema/template_base_type_param_03.cc
index 1e11ab71..f6011740 100644
--- a/tests/unit_tests/sema/template_base_type_param_03.cc
+++ b/tests/unit_tests/sema/template_base_type_param_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct A {
diff --git a/tests/unit_tests/sema/template_cache_equiv_constexpr_01.cc b/tests/unit_tests/sema/template_cache_equiv_constexpr_01.cc
index ebc5c25a..4ae947df 100644
--- a/tests/unit_tests/sema/template_cache_equiv_constexpr_01.cc
+++ b/tests/unit_tests/sema/template_cache_equiv_constexpr_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <int N>
 struct Box {};
diff --git a/tests/unit_tests/sema/template_cache_equiv_typealias_01.cc b/tests/unit_tests/sema/template_cache_equiv_typealias_01.cc
index 1c8736e9..7b095b1c 100644
--- a/tests/unit_tests/sema/template_cache_equiv_typealias_01.cc
+++ b/tests/unit_tests/sema/template_cache_equiv_typealias_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <class T>
 struct Box {};
diff --git a/tests/unit_tests/sema/template_cache_pack_symbol_dump_01.cc b/tests/unit_tests/sema/template_cache_pack_symbol_dump_01.cc
index 1f52e8c6..42b3f1bb 100644
--- a/tests/unit_tests/sema/template_cache_pack_symbol_dump_01.cc
+++ b/tests/unit_tests/sema/template_cache_pack_symbol_dump_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename... Ts>
 struct Pack {};
diff --git a/tests/unit_tests/sema/template_cache_symbol_dump_01.cc b/tests/unit_tests/sema/template_cache_symbol_dump_01.cc
index faa27383..05a9b432 100644
--- a/tests/unit_tests/sema/template_cache_symbol_dump_01.cc
+++ b/tests/unit_tests/sema/template_cache_symbol_dump_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct Box {};
diff --git a/tests/unit_tests/sema/template_class_01.cc b/tests/unit_tests/sema/template_class_01.cc
index ef7312de..e6153676 100644
--- a/tests/unit_tests/sema/template_class_01.cc
+++ b/tests/unit_tests/sema/template_class_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct A {
diff --git a/tests/unit_tests/sema/template_class_02.cc b/tests/unit_tests/sema/template_class_02.cc
index b1730d18..e767d475 100644
--- a/tests/unit_tests/sema/template_class_02.cc
+++ b/tests/unit_tests/sema/template_class_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 namespace std {
 
diff --git a/tests/unit_tests/sema/template_class_03.cc b/tests/unit_tests/sema/template_class_03.cc
index 7a88e82c..38d30b11 100644
--- a/tests/unit_tests/sema/template_class_03.cc
+++ b/tests/unit_tests/sema/template_class_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct X {
diff --git a/tests/unit_tests/sema/template_class_04.cc b/tests/unit_tests/sema/template_class_04.cc
index 4d743e77..5f3a2322 100644
--- a/tests/unit_tests/sema/template_class_04.cc
+++ b/tests/unit_tests/sema/template_class_04.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename Key, typename Value>
 struct X {
diff --git a/tests/unit_tests/sema/template_class_05.cc b/tests/unit_tests/sema/template_class_05.cc
index aa1d2954..64200525 100644
--- a/tests/unit_tests/sema/template_class_05.cc
+++ b/tests/unit_tests/sema/template_class_05.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct Outer {
diff --git a/tests/unit_tests/sema/template_class_06.cc b/tests/unit_tests/sema/template_class_06.cc
index 3cae3453..d5d272e3 100644
--- a/tests/unit_tests/sema/template_class_06.cc
+++ b/tests/unit_tests/sema/template_class_06.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 template <typename X>
 struct A {
diff --git a/tests/unit_tests/sema/template_cond_trait_01.cc b/tests/unit_tests/sema/template_cond_trait_01.cc
index aece87da..ac100fc3 100644
--- a/tests/unit_tests/sema/template_cond_trait_01.cc
+++ b/tests/unit_tests/sema/template_cond_trait_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class _Tp, _Tp _Xp>
diff --git a/tests/unit_tests/sema/template_constexpr_member_access_01.cc b/tests/unit_tests/sema/template_constexpr_member_access_01.cc
index 792686ec..eaac06ef 100644
--- a/tests/unit_tests/sema/template_constexpr_member_access_01.cc
+++ b/tests/unit_tests/sema/template_constexpr_member_access_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_deduction_basic_01.cc b/tests/unit_tests/sema/template_deduction_basic_01.cc
index 5ca44822..8b0e1c86 100644
--- a/tests/unit_tests/sema/template_deduction_basic_01.cc
+++ b/tests/unit_tests/sema/template_deduction_basic_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_deduction_const_ref_01.cc b/tests/unit_tests/sema/template_deduction_const_ref_01.cc
index 7dfc272f..2933befe 100644
--- a/tests/unit_tests/sema/template_deduction_const_ref_01.cc
+++ b/tests/unit_tests/sema/template_deduction_const_ref_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <typename T>
diff --git a/tests/unit_tests/sema/template_deduction_const_rref_01.cc b/tests/unit_tests/sema/template_deduction_const_rref_01.cc
index a22c4913..3185f910 100644
--- a/tests/unit_tests/sema/template_deduction_const_rref_01.cc
+++ b/tests/unit_tests/sema/template_deduction_const_rref_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_deduction_const_rref_02.cc b/tests/unit_tests/sema/template_deduction_const_rref_02.cc
index 9340f057..fea27751 100644
--- a/tests/unit_tests/sema/template_deduction_const_rref_02.cc
+++ b/tests/unit_tests/sema/template_deduction_const_rref_02.cc
@@ -1,4 +1,4 @@
-// RUN: not %cxx -fcheck %s
+// RUN: not %cxx %s
 
 template <class T>
 void crref(const T&&) {}
diff --git a/tests/unit_tests/sema/template_deduction_default_args_01.cc b/tests/unit_tests/sema/template_deduction_default_args_01.cc
index 0cca3417..aaf8e9ca 100644
--- a/tests/unit_tests/sema/template_deduction_default_args_01.cc
+++ b/tests/unit_tests/sema/template_deduction_default_args_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <typename T, typename U = int>
diff --git a/tests/unit_tests/sema/template_deduction_explicit_args_01.cc b/tests/unit_tests/sema/template_deduction_explicit_args_01.cc
index eb35004e..bbe409f9 100644
--- a/tests/unit_tests/sema/template_deduction_explicit_args_01.cc
+++ b/tests/unit_tests/sema/template_deduction_explicit_args_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T, class U>
diff --git a/tests/unit_tests/sema/template_deduction_forwarding_ref_01.cc b/tests/unit_tests/sema/template_deduction_forwarding_ref_01.cc
index 1c72324c..857f7407 100644
--- a/tests/unit_tests/sema/template_deduction_forwarding_ref_01.cc
+++ b/tests/unit_tests/sema/template_deduction_forwarding_ref_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_deduction_multiple_params_01.cc b/tests/unit_tests/sema/template_deduction_multiple_params_01.cc
index 30288742..e634ce0d 100644
--- a/tests/unit_tests/sema/template_deduction_multiple_params_01.cc
+++ b/tests/unit_tests/sema/template_deduction_multiple_params_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_deduction_pack_01.cc b/tests/unit_tests/sema/template_deduction_pack_01.cc
index ae3d153e..81c856a4 100644
--- a/tests/unit_tests/sema/template_deduction_pack_01.cc
+++ b/tests/unit_tests/sema/template_deduction_pack_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class... Ts>
diff --git a/tests/unit_tests/sema/template_deduction_partial_explicit_01.cc b/tests/unit_tests/sema/template_deduction_partial_explicit_01.cc
index 1c4a6e3f..6feb7895 100644
--- a/tests/unit_tests/sema/template_deduction_partial_explicit_01.cc
+++ b/tests/unit_tests/sema/template_deduction_partial_explicit_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <typename R, typename T>
diff --git a/tests/unit_tests/sema/template_deduction_pointer_01.cc b/tests/unit_tests/sema/template_deduction_pointer_01.cc
index 1f559fe3..7cf7e369 100644
--- a/tests/unit_tests/sema/template_deduction_pointer_01.cc
+++ b/tests/unit_tests/sema/template_deduction_pointer_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_deduction_pointer_02.cc b/tests/unit_tests/sema/template_deduction_pointer_02.cc
index f0685b02..174702a7 100644
--- a/tests/unit_tests/sema/template_deduction_pointer_02.cc
+++ b/tests/unit_tests/sema/template_deduction_pointer_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_deduction_ref_cv_01.cc b/tests/unit_tests/sema/template_deduction_ref_cv_01.cc
index 0c65a18b..66135ad0 100644
--- a/tests/unit_tests/sema/template_deduction_ref_cv_01.cc
+++ b/tests/unit_tests/sema/template_deduction_ref_cv_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_default_args_substitution_01.cc b/tests/unit_tests/sema/template_default_args_substitution_01.cc
index 19ae536c..3370e97c 100644
--- a/tests/unit_tests/sema/template_default_args_substitution_01.cc
+++ b/tests/unit_tests/sema/template_default_args_substitution_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T = int, int N = 4>
diff --git a/tests/unit_tests/sema/template_default_pack_nttp_sfinae_01.cc b/tests/unit_tests/sema/template_default_pack_nttp_sfinae_01.cc
index b68e06f0..97c4591c 100644
--- a/tests/unit_tests/sema/template_default_pack_nttp_sfinae_01.cc
+++ b/tests/unit_tests/sema/template_default_pack_nttp_sfinae_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class... Ts, int N = sizeof...(Ts)>
diff --git a/tests/unit_tests/sema/template_dep_class_template_arg_01.cc b/tests/unit_tests/sema/template_dep_class_template_arg_01.cc
index 5a0fd927..5679b5be 100644
--- a/tests/unit_tests/sema/template_dep_class_template_arg_01.cc
+++ b/tests/unit_tests/sema/template_dep_class_template_arg_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class A, class B>
diff --git a/tests/unit_tests/sema/template_dep_explicit_specifier_01.cc b/tests/unit_tests/sema/template_dep_explicit_specifier_01.cc
index ed6aed0d..c0e42ee9 100644
--- a/tests/unit_tests/sema/template_dep_explicit_specifier_01.cc
+++ b/tests/unit_tests/sema/template_dep_explicit_specifier_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct check {
diff --git a/tests/unit_tests/sema/template_dep_member_access_01.cc b/tests/unit_tests/sema/template_dep_member_access_01.cc
index 7190eb6f..4ba7142f 100644
--- a/tests/unit_tests/sema/template_dep_member_access_01.cc
+++ b/tests/unit_tests/sema/template_dep_member_access_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_dep_subscript_01.cc b/tests/unit_tests/sema/template_dep_subscript_01.cc
index 64ee7ec4..d9d90404 100644
--- a/tests/unit_tests/sema/template_dep_subscript_01.cc
+++ b/tests/unit_tests/sema/template_dep_subscript_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T, int N>
diff --git a/tests/unit_tests/sema/template_explicit_condition_eval_01.cc b/tests/unit_tests/sema/template_explicit_condition_eval_01.cc
index 0ba92d44..279905b6 100644
--- a/tests/unit_tests/sema/template_explicit_condition_eval_01.cc
+++ b/tests/unit_tests/sema/template_explicit_condition_eval_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <bool B>
diff --git a/tests/unit_tests/sema/template_explicit_nttp_after_pack_01.cc b/tests/unit_tests/sema/template_explicit_nttp_after_pack_01.cc
index a33077bb..2162cf88 100644
--- a/tests/unit_tests/sema/template_explicit_nttp_after_pack_01.cc
+++ b/tests/unit_tests/sema/template_explicit_nttp_after_pack_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <int N, class... Ts>
diff --git a/tests/unit_tests/sema/template_explicit_wrong_kind_01.cc b/tests/unit_tests/sema/template_explicit_wrong_kind_01.cc
index ef0e2f9e..2e0b132f 100644
--- a/tests/unit_tests/sema/template_explicit_wrong_kind_01.cc
+++ b/tests/unit_tests/sema/template_explicit_wrong_kind_01.cc
@@ -1,4 +1,4 @@
-// RUN: not %cxx -fcheck %s
+// RUN: not %cxx %s
 
 template <int... Ns, class U>
 auto wrong_kind(U) -> char;
diff --git a/tests/unit_tests/sema/template_fwd_default_args_01.cc b/tests/unit_tests/sema/template_fwd_default_args_01.cc
index cccdf5a4..7021c848 100644
--- a/tests/unit_tests/sema/template_fwd_default_args_01.cc
+++ b/tests/unit_tests/sema/template_fwd_default_args_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Default template arguments from forward declarations should be
 // carried over to the definition when not repeated.
diff --git a/tests/unit_tests/sema/template_fwd_default_args_02.cc b/tests/unit_tests/sema/template_fwd_default_args_02.cc
index 863402d7..8b9f1ce6 100644
--- a/tests/unit_tests/sema/template_fwd_default_args_02.cc
+++ b/tests/unit_tests/sema/template_fwd_default_args_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T = int>
diff --git a/tests/unit_tests/sema/template_fwddecl_get_01.cc b/tests/unit_tests/sema/template_fwddecl_get_01.cc
index e078a655..923a091d 100644
--- a/tests/unit_tests/sema/template_fwddecl_get_01.cc
+++ b/tests/unit_tests/sema/template_fwddecl_get_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 using size_t = decltype(sizeof(int));
diff --git a/tests/unit_tests/sema/template_fwddecl_swap_01.cc b/tests/unit_tests/sema/template_fwddecl_swap_01.cc
index dcdd9947..0b90f0e0 100644
--- a/tests/unit_tests/sema/template_fwddecl_swap_01.cc
+++ b/tests/unit_tests/sema/template_fwddecl_swap_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <bool, class T = void>
diff --git a/tests/unit_tests/sema/template_lambda_01.cc b/tests/unit_tests/sema/template_lambda_01.cc
index 20009815..e3872f30 100644
--- a/tests/unit_tests/sema/template_lambda_01.cc
+++ b/tests/unit_tests/sema/template_lambda_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Template lambda IIFE with non-type parameter: static_assert fires on
 // instantiation with the default argument _False=false.
diff --git a/tests/unit_tests/sema/template_member_call_01.cc b/tests/unit_tests/sema/template_member_call_01.cc
index 23b371ea..0dd0f63e 100644
--- a/tests/unit_tests/sema/template_member_call_01.cc
+++ b/tests/unit_tests/sema/template_member_call_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_member_ctor_mangle_01.cc b/tests/unit_tests/sema/template_member_ctor_mangle_01.cc
index 6d1e1f5b..2622fb4b 100644
--- a/tests/unit_tests/sema/template_member_ctor_mangle_01.cc
+++ b/tests/unit_tests/sema/template_member_ctor_mangle_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 namespace std {
diff --git a/tests/unit_tests/sema/template_nns_alias_base_01.cc b/tests/unit_tests/sema/template_nns_alias_base_01.cc
index f609d7ea..26e82e97 100644
--- a/tests/unit_tests/sema/template_nns_alias_base_01.cc
+++ b/tests/unit_tests/sema/template_nns_alias_base_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct A {};
diff --git a/tests/unit_tests/sema/template_nothrow_assignable_01.cc b/tests/unit_tests/sema/template_nothrow_assignable_01.cc
index ccf78515..36a5f05e 100644
--- a/tests/unit_tests/sema/template_nothrow_assignable_01.cc
+++ b/tests/unit_tests/sema/template_nothrow_assignable_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class _Tp, _Tp _Xp>
diff --git a/tests/unit_tests/sema/template_nttp_non_constexpr_diag_01.cc b/tests/unit_tests/sema/template_nttp_non_constexpr_diag_01.cc
index 7d1d7872..fa9b14b3 100644
--- a/tests/unit_tests/sema/template_nttp_non_constexpr_diag_01.cc
+++ b/tests/unit_tests/sema/template_nttp_non_constexpr_diag_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -fstrict-templates %s
+// RUN: %cxx -verify -fstrict-templates %s
 
 template <int N>
 struct Box {};
diff --git a/tests/unit_tests/sema/template_out_of_line_01.cc b/tests/unit_tests/sema/template_out_of_line_01.cc
index 70635608..8bf55b43 100644
--- a/tests/unit_tests/sema/template_out_of_line_01.cc
+++ b/tests/unit_tests/sema/template_out_of_line_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 struct Box {
diff --git a/tests/unit_tests/sema/template_out_of_line_02.cc b/tests/unit_tests/sema/template_out_of_line_02.cc
index f6e52cbb..407d8f01 100644
--- a/tests/unit_tests/sema/template_out_of_line_02.cc
+++ b/tests/unit_tests/sema/template_out_of_line_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 struct Pair {
diff --git a/tests/unit_tests/sema/template_out_of_line_03.cc b/tests/unit_tests/sema/template_out_of_line_03.cc
index f34a5aec..f0ffeecc 100644
--- a/tests/unit_tests/sema/template_out_of_line_03.cc
+++ b/tests/unit_tests/sema/template_out_of_line_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename K, typename V>
 struct Map {
diff --git a/tests/unit_tests/sema/template_partial_ambiguous_diag_01.cc b/tests/unit_tests/sema/template_partial_ambiguous_diag_01.cc
index 787f0eef..703cc96c 100644
--- a/tests/unit_tests/sema/template_partial_ambiguous_diag_01.cc
+++ b/tests/unit_tests/sema/template_partial_ambiguous_diag_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <class T, class U>
 struct S;
diff --git a/tests/unit_tests/sema/template_partial_decl_order_tiebreak_01.cc b/tests/unit_tests/sema/template_partial_decl_order_tiebreak_01.cc
index 62da4ecf..ccd59af8 100644
--- a/tests/unit_tests/sema/template_partial_decl_order_tiebreak_01.cc
+++ b/tests/unit_tests/sema/template_partial_decl_order_tiebreak_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <int A, int B>
 struct pick_n {
diff --git a/tests/unit_tests/sema/template_partial_nested_pack_head_01.cc b/tests/unit_tests/sema/template_partial_nested_pack_head_01.cc
index 679dcb19..07d9f52a 100644
--- a/tests/unit_tests/sema/template_partial_nested_pack_head_01.cc
+++ b/tests/unit_tests/sema/template_partial_nested_pack_head_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_partial_nested_specificity_01.cc b/tests/unit_tests/sema/template_partial_nested_specificity_01.cc
index 0879d6f5..038455ef 100644
--- a/tests/unit_tests/sema/template_partial_nested_specificity_01.cc
+++ b/tests/unit_tests/sema/template_partial_nested_specificity_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_partial_nested_tiebreak_01.cc b/tests/unit_tests/sema/template_partial_nested_tiebreak_01.cc
index 76edfee8..7688a7c7 100644
--- a/tests/unit_tests/sema/template_partial_nested_tiebreak_01.cc
+++ b/tests/unit_tests/sema/template_partial_nested_tiebreak_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_partial_nontype_repeat_01.cc b/tests/unit_tests/sema/template_partial_nontype_repeat_01.cc
index 0eb43969..fd826e40 100644
--- a/tests/unit_tests/sema/template_partial_nontype_repeat_01.cc
+++ b/tests/unit_tests/sema/template_partial_nontype_repeat_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <int N, class T>
diff --git a/tests/unit_tests/sema/template_partial_order_01.cc b/tests/unit_tests/sema/template_partial_order_01.cc
index e6d9c830..49de3d57 100644
--- a/tests/unit_tests/sema/template_partial_order_01.cc
+++ b/tests/unit_tests/sema/template_partial_order_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T, typename U>
 struct S {
diff --git a/tests/unit_tests/sema/template_partial_pack_vs_nopack_01.cc b/tests/unit_tests/sema/template_partial_pack_vs_nopack_01.cc
index 9efd1343..21f3df4e 100644
--- a/tests/unit_tests/sema/template_partial_pack_vs_nopack_01.cc
+++ b/tests/unit_tests/sema/template_partial_pack_vs_nopack_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <class... Ts>
 struct TypeList {};
diff --git a/tests/unit_tests/sema/template_partial_spec_01.cc b/tests/unit_tests/sema/template_partial_spec_01.cc
index 7fe383da..3648dbe9 100644
--- a/tests/unit_tests/sema/template_partial_spec_01.cc
+++ b/tests/unit_tests/sema/template_partial_spec_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <class... _Types>
 struct __type_list {};
diff --git a/tests/unit_tests/sema/template_partial_tiebreak_01.cc b/tests/unit_tests/sema/template_partial_tiebreak_01.cc
index eed89238..3aa77dee 100644
--- a/tests/unit_tests/sema/template_partial_tiebreak_01.cc
+++ b/tests/unit_tests/sema/template_partial_tiebreak_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T, typename U>
 struct S;
diff --git a/tests/unit_tests/sema/template_sfinae_enable_if_01.cc b/tests/unit_tests/sema/template_sfinae_enable_if_01.cc
index 374075dd..657e918e 100644
--- a/tests/unit_tests/sema/template_sfinae_enable_if_01.cc
+++ b/tests/unit_tests/sema/template_sfinae_enable_if_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <bool B, class T = void>
diff --git a/tests/unit_tests/sema/template_sfinae_member_01.cc b/tests/unit_tests/sema/template_sfinae_member_01.cc
index fb19c8f7..d2678ae1 100644
--- a/tests/unit_tests/sema/template_sfinae_member_01.cc
+++ b/tests/unit_tests/sema/template_sfinae_member_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct false_t {};
diff --git a/tests/unit_tests/sema/template_sfinae_mixed_01.cc b/tests/unit_tests/sema/template_sfinae_mixed_01.cc
index 54c5ad90..2335b930 100644
--- a/tests/unit_tests/sema/template_sfinae_mixed_01.cc
+++ b/tests/unit_tests/sema/template_sfinae_mixed_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <bool B, class T = void>
diff --git a/tests/unit_tests/sema/template_sfinae_pack_deduction_01.cc b/tests/unit_tests/sema/template_sfinae_pack_deduction_01.cc
index 549fce61..c1fb9686 100644
--- a/tests/unit_tests/sema/template_sfinae_pack_deduction_01.cc
+++ b/tests/unit_tests/sema/template_sfinae_pack_deduction_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class... Ts, class U>
diff --git a/tests/unit_tests/sema/template_sfinae_substitution_01.cc b/tests/unit_tests/sema/template_sfinae_substitution_01.cc
index 3b6e0cda..ff321d7f 100644
--- a/tests/unit_tests/sema/template_sfinae_substitution_01.cc
+++ b/tests/unit_tests/sema/template_sfinae_substitution_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct has_type_member {
diff --git a/tests/unit_tests/sema/template_sfinae_substitution_02.cc b/tests/unit_tests/sema/template_sfinae_substitution_02.cc
index cef1d42a..14b0e766 100644
--- a/tests/unit_tests/sema/template_sfinae_substitution_02.cc
+++ b/tests/unit_tests/sema/template_sfinae_substitution_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct with_type {
diff --git a/tests/unit_tests/sema/template_sfinae_substitution_03.cc b/tests/unit_tests/sema/template_sfinae_substitution_03.cc
index 1d4dcecd..bd5cd77b 100644
--- a/tests/unit_tests/sema/template_sfinae_substitution_03.cc
+++ b/tests/unit_tests/sema/template_sfinae_substitution_03.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct with_size_type {
diff --git a/tests/unit_tests/sema/template_sfinae_void_ref_01.cc b/tests/unit_tests/sema/template_sfinae_void_ref_01.cc
index 414490a6..7134ca3f 100644
--- a/tests/unit_tests/sema/template_sfinae_void_ref_01.cc
+++ b/tests/unit_tests/sema/template_sfinae_void_ref_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct false_type {
diff --git a/tests/unit_tests/sema/template_specialization_fwd_decl_01.cc b/tests/unit_tests/sema/template_specialization_fwd_decl_01.cc
index e7ca36db..21afc6b3 100644
--- a/tests/unit_tests/sema/template_specialization_fwd_decl_01.cc
+++ b/tests/unit_tests/sema/template_specialization_fwd_decl_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 template <class T>
diff --git a/tests/unit_tests/sema/template_ttp_01.cc b/tests/unit_tests/sema/template_ttp_01.cc
index 16e08ecd..680127e7 100644
--- a/tests/unit_tests/sema/template_ttp_01.cc
+++ b/tests/unit_tests/sema/template_ttp_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 template <typename T>
 struct Holder {
diff --git a/tests/unit_tests/sema/template_typename_nonscope_diag_01.cc b/tests/unit_tests/sema/template_typename_nonscope_diag_01.cc
index 4d69418b..3620e3ad 100644
--- a/tests/unit_tests/sema/template_typename_nonscope_diag_01.cc
+++ b/tests/unit_tests/sema/template_typename_nonscope_diag_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename T>
 struct S {
diff --git a/tests/unit_tests/sema/template_var_01.cc b/tests/unit_tests/sema/template_var_01.cc
index 31ad337c..1e6ec1ce 100644
--- a/tests/unit_tests/sema/template_var_01.cc
+++ b/tests/unit_tests/sema/template_var_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s
+// RUN: %cxx -verify -dump-symbols %s
 
 template <typename T>
 constexpr bool is_integral_v = __is_integral(T);
diff --git a/tests/unit_tests/sema/trailing_return_type_01.cc b/tests/unit_tests/sema/trailing_return_type_01.cc
index 3ce0f116..7ecb1df6 100644
--- a/tests/unit_tests/sema/trailing_return_type_01.cc
+++ b/tests/unit_tests/sema/trailing_return_type_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 struct list {
   using value_type = int;
diff --git a/tests/unit_tests/sema/trailing_return_type_02.cc b/tests/unit_tests/sema/trailing_return_type_02.cc
index 9befedd0..93577412 100644
--- a/tests/unit_tests/sema/trailing_return_type_02.cc
+++ b/tests/unit_tests/sema/trailing_return_type_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 auto f(int x) -> decltype(x);
 auto g(int x, decltype(x)* y) -> decltype(y);
diff --git a/tests/unit_tests/sema/type_construction_builtin_01.cc b/tests/unit_tests/sema/type_construction_builtin_01.cc
index 70655655..2d6acafd 100644
--- a/tests/unit_tests/sema/type_construction_builtin_01.cc
+++ b/tests/unit_tests/sema/type_construction_builtin_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 bool f() { return bool(true); }
diff --git a/tests/unit_tests/sema/type_pack_element_01.cc b/tests/unit_tests/sema/type_pack_element_01.cc
index f1e8d76b..c4a9aa15 100644
--- a/tests/unit_tests/sema/type_pack_element_01.cc
+++ b/tests/unit_tests/sema/type_pack_element_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // expected-no-diagnostics
 
diff --git a/tests/unit_tests/sema/type_traits_01.cc b/tests/unit_tests/sema/type_traits_01.cc
index 535a4e39..45fee586 100644
--- a/tests/unit_tests/sema/type_traits_01.cc
+++ b/tests/unit_tests/sema/type_traits_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 //
 // is_void trait
diff --git a/tests/unit_tests/sema/type_traits_02.cc b/tests/unit_tests/sema/type_traits_02.cc
index df61cd7c..3c67f4dc 100644
--- a/tests/unit_tests/sema/type_traits_02.cc
+++ b/tests/unit_tests/sema/type_traits_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct Empty {};
 
diff --git a/tests/unit_tests/sema/type_traits_03.cc b/tests/unit_tests/sema/type_traits_03.cc
index f2231116..0d59889c 100644
--- a/tests/unit_tests/sema/type_traits_03.cc
+++ b/tests/unit_tests/sema/type_traits_03.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct A { int m; };
 struct B { B(B const&) {} };
diff --git a/tests/unit_tests/sema/type_traits_overload_set.cc b/tests/unit_tests/sema/type_traits_overload_set.cc
index e2ba7885..f0a7c37a 100644
--- a/tests/unit_tests/sema/type_traits_overload_set.cc
+++ b/tests/unit_tests/sema/type_traits_overload_set.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct BothDefaulted {
   BothDefaulted& operator=(const BothDefaulted&) = default;
diff --git a/tests/unit_tests/sema/type_traits_template.cc b/tests/unit_tests/sema/type_traits_template.cc
index 859f83a3..b364d24f 100644
--- a/tests/unit_tests/sema/type_traits_template.cc
+++ b/tests/unit_tests/sema/type_traits_template.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct TrivialBoth {
   TrivialBoth& operator=(const TrivialBoth&) = default;
diff --git a/tests/unit_tests/sema/typeid_ok_01.cc b/tests/unit_tests/sema/typeid_ok_01.cc
index a3785842..81a670cb 100644
--- a/tests/unit_tests/sema/typeid_ok_01.cc
+++ b/tests/unit_tests/sema/typeid_ok_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 using info = __builtin_meta_info;
 
diff --git a/tests/unit_tests/sema/typeid_unresolved_id_01.cc b/tests/unit_tests/sema/typeid_unresolved_id_01.cc
index e60ff515..a85678b5 100644
--- a/tests/unit_tests/sema/typeid_unresolved_id_01.cc
+++ b/tests/unit_tests/sema/typeid_unresolved_id_01.cc
@@ -1,3 +1,3 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto m = typeid(missing_identifier); // expected-error {{use of undeclared identifier 'missing_identifier'}}
diff --git a/tests/unit_tests/sema/typename_nns_alias_resolve_01.cc b/tests/unit_tests/sema/typename_nns_alias_resolve_01.cc
index b640a61b..abfd41f7 100644
--- a/tests/unit_tests/sema/typename_nns_alias_resolve_01.cc
+++ b/tests/unit_tests/sema/typename_nns_alias_resolve_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct A {};
diff --git a/tests/unit_tests/sema/unary_minus_01.cc b/tests/unit_tests/sema/unary_minus_01.cc
index bb034468..dd98afc2 100644
--- a/tests/unit_tests/sema/unary_minus_01.cc
+++ b/tests/unit_tests/sema/unary_minus_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto main() -> int {
   static_assert(__is_same(decltype(-'a'), int));
diff --git a/tests/unit_tests/sema/unary_plus_01.cc b/tests/unit_tests/sema/unary_plus_01.cc
index 99a63924..586d7c2b 100644
--- a/tests/unit_tests/sema/unary_plus_01.cc
+++ b/tests/unit_tests/sema/unary_plus_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 auto main() -> int {
   static_assert(__is_same(decltype(+'a'), int));
diff --git a/tests/unit_tests/sema/union_zero_init_01.c b/tests/unit_tests/sema/union_zero_init_01.c
index 50529e3a..4541375c 100644
--- a/tests/unit_tests/sema/union_zero_init_01.c
+++ b/tests/unit_tests/sema/union_zero_init_01.c
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain macos -verify -fcheck %s
+// RUN: %cxx -toolchain macos -verify %s
 // expected-no-diagnostics
 
 typedef union {
diff --git a/tests/unit_tests/sema/unresolved_call_identifier_01.cc b/tests/unit_tests/sema/unresolved_call_identifier_01.cc
index c017e894..7a729491 100644
--- a/tests/unit_tests/sema/unresolved_call_identifier_01.cc
+++ b/tests/unit_tests/sema/unresolved_call_identifier_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // expected-error@1 {{use of undeclared identifier 'missing'}}
 int x = missing(42);
diff --git a/tests/unit_tests/sema/user_conversion_01.cc b/tests/unit_tests/sema/user_conversion_01.cc
index 32c0b551..659dd020 100644
--- a/tests/unit_tests/sema/user_conversion_01.cc
+++ b/tests/unit_tests/sema/user_conversion_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct String {
   String(const char* s) {}
diff --git a/tests/unit_tests/sema/user_conversion_02.cc b/tests/unit_tests/sema/user_conversion_02.cc
index 2e5096f7..675b94fa 100644
--- a/tests/unit_tests/sema/user_conversion_02.cc
+++ b/tests/unit_tests/sema/user_conversion_02.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct A {
   A(int x) {}
diff --git a/tests/unit_tests/sema/using_decl_01.cc b/tests/unit_tests/sema/using_decl_01.cc
index c2e4295a..985ea918 100644
--- a/tests/unit_tests/sema/using_decl_01.cc
+++ b/tests/unit_tests/sema/using_decl_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -dump-symbols %s | %filecheck %s
 
 int printf(const char*, ...);
 
diff --git a/tests/unit_tests/sema/variable_redecl_array_complete_01.cc b/tests/unit_tests/sema/variable_redecl_array_complete_01.cc
index b18a14c1..d4a1b888 100644
--- a/tests/unit_tests/sema/variable_redecl_array_complete_01.cc
+++ b/tests/unit_tests/sema/variable_redecl_array_complete_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 extern int data[];
diff --git a/tests/unit_tests/sema/variable_redecl_array_conflict_01.cc b/tests/unit_tests/sema/variable_redecl_array_conflict_01.cc
index 53677e38..7b2888e1 100644
--- a/tests/unit_tests/sema/variable_redecl_array_conflict_01.cc
+++ b/tests/unit_tests/sema/variable_redecl_array_conflict_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int items[2];
 
diff --git a/tests/unit_tests/sema/variable_redecl_conflict_01.cc b/tests/unit_tests/sema/variable_redecl_conflict_01.cc
index f8619aea..745f94e5 100644
--- a/tests/unit_tests/sema/variable_redecl_conflict_01.cc
+++ b/tests/unit_tests/sema/variable_redecl_conflict_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 int x;
 
diff --git a/tests/unit_tests/sema/variable_template_partial_spec_01.cc b/tests/unit_tests/sema/variable_template_partial_spec_01.cc
index 57b025e9..d9c9b9af 100644
--- a/tests/unit_tests/sema/variable_template_partial_spec_01.cc
+++ b/tests/unit_tests/sema/variable_template_partial_spec_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 // Variable template partial specialization: base case and recursive evaluation
 template <long _Xp, long _Yp>
diff --git a/tests/unit_tests/sema/variadic_abbrev_func_01.cc b/tests/unit_tests/sema/variadic_abbrev_func_01.cc
index 69a66dd9..773be9e0 100644
--- a/tests/unit_tests/sema/variadic_abbrev_func_01.cc
+++ b/tests/unit_tests/sema/variadic_abbrev_func_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 constexpr int count_abbrev(auto... args) { return sizeof...(args); }
 
diff --git a/tests/unit_tests/sema/variadic_base_01.cc b/tests/unit_tests/sema/variadic_base_01.cc
index d8baf969..79f706c2 100644
--- a/tests/unit_tests/sema/variadic_base_01.cc
+++ b/tests/unit_tests/sema/variadic_base_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct TagA {
   int a;
diff --git a/tests/unit_tests/sema/variadic_expand_01.cc b/tests/unit_tests/sema/variadic_expand_01.cc
index 3fe7b902..b0eedc5c 100644
--- a/tests/unit_tests/sema/variadic_expand_01.cc
+++ b/tests/unit_tests/sema/variadic_expand_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <int... Ns>
 constexpr int nttp_count() {
diff --git a/tests/unit_tests/sema/variadic_fold_01.cc b/tests/unit_tests/sema/variadic_fold_01.cc
index 4679f468..d020c2ab 100644
--- a/tests/unit_tests/sema/variadic_fold_01.cc
+++ b/tests/unit_tests/sema/variadic_fold_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <int... Ns>
 constexpr int sum_left() {
diff --git a/tests/unit_tests/sema/variadic_func_deduction_01.cc b/tests/unit_tests/sema/variadic_func_deduction_01.cc
index 7b68e0a0..84b619d1 100644
--- a/tests/unit_tests/sema/variadic_func_deduction_01.cc
+++ b/tests/unit_tests/sema/variadic_func_deduction_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename... Ts>
 constexpr int count(Ts... args) {
diff --git a/tests/unit_tests/sema/variadic_pack_01.cc b/tests/unit_tests/sema/variadic_pack_01.cc
index 5d98508a..d6b3e8ac 100644
--- a/tests/unit_tests/sema/variadic_pack_01.cc
+++ b/tests/unit_tests/sema/variadic_pack_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 template <typename... Ts>
 constexpr int count() {
diff --git a/tests/unit_tests/sema/virtual_functions_01.cc b/tests/unit_tests/sema/virtual_functions_01.cc
index 612dee8d..f468cdad 100644
--- a/tests/unit_tests/sema/virtual_functions_01.cc
+++ b/tests/unit_tests/sema/virtual_functions_01.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck -dump-symbols %s | %filecheck %s
+// RUN: %cxx -verify -dump-symbols %s | %filecheck %s
 
 struct Base {
   virtual void f();
diff --git a/tests/unit_tests/sema/virtual_functions_02.cc b/tests/unit_tests/sema/virtual_functions_02.cc
index 3364139a..fa50cc12 100644
--- a/tests/unit_tests/sema/virtual_functions_02.cc
+++ b/tests/unit_tests/sema/virtual_functions_02.cc
@@ -1,5 +1,5 @@
 // clang-format off
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 
 struct NoBase {
   void f() override; // expected-error {{'f' marked 'override' but does not override any member function}}
diff --git a/tests/unit_tests/sema/wasm_stdlib_01.cc b/tests/unit_tests/sema/wasm_stdlib_01.cc
index 240bf13d..f5eedfa9 100644
--- a/tests/unit_tests/sema/wasm_stdlib_01.cc
+++ b/tests/unit_tests/sema/wasm_stdlib_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -toolchain wasm32 -fcheck %s
+// RUN: %cxx -toolchain wasm32 %s
 
 #include <bit>
 #include <cassert>
diff --git a/tests/unit_tests/sema/while_condition_decl_01.cc b/tests/unit_tests/sema/while_condition_decl_01.cc
index d02a8d64..ea5364d2 100644
--- a/tests/unit_tests/sema/while_condition_decl_01.cc
+++ b/tests/unit_tests/sema/while_condition_decl_01.cc
@@ -1,4 +1,4 @@
-// RUN: %cxx -verify -fcheck %s
+// RUN: %cxx -verify %s
 // expected-no-diagnostics
 
 struct Node {