rust-lang
diff --git a/‎src/bootstrap/step.rs
+4-2 b/‎src/bootstrap/step.rs
+4-2
diff --git a/‎src/test/ui/custom-derive/auxiliary/plugin.rs renamed to ‎src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs b/‎src/test/ui/custom-derive/auxiliary/plugin.rs renamed to ‎src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs
diff --git a/‎src/test/ui/custom-derive/issue-36935.rs renamed to ‎src/test/ui-fulldeps/custom-derive/issue-36935.rs b/‎src/test/ui/custom-derive/issue-36935.rs renamed to ‎src/test/ui-fulldeps/custom-derive/issue-36935.rs
diff --git a/‎src/test/ui/custom-derive/issue-36935.stderr renamed to ‎src/test/ui-fulldeps/custom-derive/issue-36935.stderr b/‎src/test/ui/custom-derive/issue-36935.stderr renamed to ‎src/test/ui-fulldeps/custom-derive/issue-36935.stderr
@@ -312,6 +312,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
                  });
         };
 
+        suite("check-ui", "src/test/ui", "ui", "ui");
         suite("check-rpass", "src/test/run-pass", "run-pass", "run-pass");
         suite("check-cfail", "src/test/compile-fail", "compile-fail", "compile-fail");
         suite("check-pfail", "src/test/parse-fail", "parse-fail", "parse-fail");
@@ -372,7 +373,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules {
                  });
         };
 
-        suite("check-ui", "src/test/ui", "ui", "ui");
+        suite("check-ui-full", "src/test/ui-fulldeps", "ui", "ui-fulldeps");
         suite("check-rpass-full", "src/test/run-pass-fulldeps",
               "run-pass", "run-pass-fulldeps");
         suite("check-rfail-full", "src/test/run-fail-fulldeps",
@@ -1530,7 +1531,8 @@ mod tests {
         assert!(plan.iter().all(|s| s.host == "A"));
         assert!(plan.iter().all(|s| s.target == "C"));
 
-        assert!(!plan.iter().any(|s| s.name.contains("-ui")));
+        assert!(plan.iter().any(|s| s.name.contains("-ui")));
+        assert!(!plan.iter().any(|s| s.name.contains("ui-full")));
         assert!(plan.iter().any(|s| s.name.contains("cfail")));
         assert!(!plan.iter().any(|s| s.name.contains("cfail-full")));
         assert!(plan.iter().any(|s| s.name.contains("codegen-units")));