diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 4be013e480e..98c3df58f87 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -493,8 +493,6 @@ static DEFAULT_COMPILETESTS: &[Test] = &[
 
     // What this runs varies depending on the native platform being apple
     Test { path: "src/test/debuginfo", mode: "debuginfo-XXX", suite: "debuginfo" },
-    Test { path: "src/test/debuginfo-lldb", mode: "debuginfo-lldb", suite: "debuginfo" },
-    Test { path: "src/test/debuginfo-gdb", mode: "debuginfo-gdb", suite: "debuginfo" },
 ];
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
@@ -680,6 +678,11 @@ impl Step for Compiletest {
         }
 
         if suite == "debuginfo" {
+            // Skip debuginfo tests on MSVC
+            if build.build.contains("msvc") {
+                return;
+            }
+
             if mode == "debuginfo-XXX" {
                 return if build.build.contains("apple") {
                     builder.ensure(Compiletest {
@@ -694,11 +697,6 @@ impl Step for Compiletest {
                 };
             }
 
-            // Skip debuginfo tests on MSVC
-            if build.build.contains("msvc") {
-                return;
-            }
-
             builder.ensure(dist::DebuggerScripts {
                 sysroot: builder.sysroot(compiler),
                 target: target