diff --git a/src/test/ui/compiletest-compile-flags-last.rs b/src/test/ui/compiletest-self-test/compile-flags-last.rs
similarity index 100%
rename from src/test/ui/compiletest-compile-flags-last.rs
rename to src/test/ui/compiletest-self-test/compile-flags-last.rs
diff --git a/src/test/ui/compiletest-compile-flags-last.stderr b/src/test/ui/compiletest-self-test/compile-flags-last.stderr
similarity index 100%
rename from src/test/ui/compiletest-compile-flags-last.stderr
rename to src/test/ui/compiletest-self-test/compile-flags-last.stderr
diff --git a/src/test/ui/ui-testing-optout.rs b/src/test/ui/compiletest-self-test/ui-testing-optout.rs
similarity index 100%
rename from src/test/ui/ui-testing-optout.rs
rename to src/test/ui/compiletest-self-test/ui-testing-optout.rs
diff --git a/src/test/ui/ui-testing-optout.stderr b/src/test/ui/compiletest-self-test/ui-testing-optout.stderr
similarity index 100%
rename from src/test/ui/ui-testing-optout.stderr
rename to src/test/ui/compiletest-self-test/ui-testing-optout.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index d307d6f43b1..c600f99c2c4 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,7 +7,7 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 949;
+const ROOT_ENTRY_LIMIT: usize = 948;
 const ISSUES_ENTRY_LIMIT: usize = 2117;
 
 fn check_entries(path: &Path, bad: &mut bool) {