diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d924aafaff574..dea53b02c70d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,17 +48,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            os: ubuntu-20.04-16core-64gb
-            env: {}
-          - name: mingw-check-tidy
-            os: ubuntu-20.04-16core-64gb
-            env: {}
-          - name: x86_64-gnu-llvm-14
-            os: ubuntu-20.04-16core-64gb
-            env: {}
-          - name: x86_64-gnu-tools
-            os: ubuntu-20.04-16core-64gb
+          - name: x86_64-gnu
+            os: ubuntu-20.04-8core-32gb
             env: {}
     timeout-minutes: 600
     runs-on: "${{ matrix.os }}"
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 05b66f94727ad..cbdc2f00e6769 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -684,60 +684,8 @@ impl<'a> Builder<'a> {
                 crate::toolstate::ToolStateCheck,
                 test::ExpandYamlAnchors,
                 test::Tidy,
-                test::Ui,
-                test::RunPassValgrind,
                 test::RunCoverage,
-                test::MirOpt,
-                test::Codegen,
-                test::CodegenUnits,
-                test::Assembly,
-                test::Incremental,
-                test::Debuginfo,
-                test::UiFullDeps,
-                test::Rustdoc,
                 test::RunCoverageRustdoc,
-                test::Pretty,
-                test::Crate,
-                test::CrateLibrustc,
-                test::CrateRustdoc,
-                test::CrateRustdocJsonTypes,
-                test::CrateBootstrap,
-                test::Linkcheck,
-                test::TierCheck,
-                test::Cargotest,
-                test::Cargo,
-                test::RustAnalyzer,
-                test::ErrorIndex,
-                test::Distcheck,
-                test::RunMakeFullDeps,
-                test::Nomicon,
-                test::Reference,
-                test::RustdocBook,
-                test::RustByExample,
-                test::TheBook,
-                test::UnstableBook,
-                test::RustcBook,
-                test::LintDocs,
-                test::RustcGuide,
-                test::EmbeddedBook,
-                test::EditionGuide,
-                test::Rustfmt,
-                test::Miri,
-                test::Clippy,
-                test::RustDemangler,
-                test::CompiletestTest,
-                test::RustdocJSStd,
-                test::RustdocJSNotStd,
-                test::RustdocGUI,
-                test::RustdocTheme,
-                test::RustdocUi,
-                test::RustdocJson,
-                test::HtmlCheck,
-                test::RustInstaller,
-                // Run bootstrap close to the end as it's unlikely to fail
-                test::Bootstrap,
-                // Run run-make last, since these won't pass without make on Windows
-                test::RunMake,
             ),
             Kind::Bench => describe!(test::Crate, test::CrateLibrustc),
             Kind::Doc => describe!(
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index df9b242a47b69..f43b64664ede9 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -316,17 +316,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-16c
-
-          - name: mingw-check-tidy
-            <<: *job-linux-16c
-
-          - name: x86_64-gnu-llvm-14
-            <<: *job-linux-16c
-
-          - name: x86_64-gnu-tools
-            <<: *job-linux-16c
+          - name: x86_64-gnu
+            <<: *job-linux-8c
 
   auto:
     <<: *base-ci-job