diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 9d5e12aac5f7..f6ac936df4d6 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -53,16 +53,8 @@ jobs:
     - name: Test "--fix -Zunstable-options"
       run: cargo run --features deny-warnings,internal-lints --bin cargo-clippy -- clippy --fix -Zunstable-options
 
-    - name: Test
-      run: cargo test --features deny-warnings,internal-lints
-
-    - name: Test clippy_lints
-      run: cargo test --features deny-warnings,internal-lints
-      working-directory: clippy_lints
-
-    - name: Test rustc_tools_util
-      run: cargo test --features deny-warnings
-      working-directory: rustc_tools_util
+    - name: Test Workspace
+      run: cargo test --all --features deny-warnings,internal-lints
 
     - name: Test clippy_dev
       run: cargo test --features deny-warnings
diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml
index 5d846eb64c78..9d24b0293c4a 100644
--- a/.github/workflows/clippy_bors.yml
+++ b/.github/workflows/clippy_bors.yml
@@ -112,16 +112,8 @@ jobs:
     - name: Build
       run: cargo build --features deny-warnings,internal-lints
 
-    - name: Test
-      run: cargo test --features deny-warnings,internal-lints
-
-    - name: Test clippy_lints
-      run: cargo test --features deny-warnings,internal-lints
-      working-directory: clippy_lints
-
-    - name: Test rustc_tools_util
-      run: cargo test --features deny-warnings
-      working-directory: rustc_tools_util
+    - name: Test Workspace
+      run: cargo test --all --features deny-warnings,internal-lints
 
     - name: Test clippy_dev
       run: cargo test --features deny-warnings