diff --git a/src/test/ui/parser/lex-bad-binary-literal.rs b/src/test/ui/lexer/lex-bad-binary-literal.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-binary-literal.rs
rename to src/test/ui/lexer/lex-bad-binary-literal.rs
diff --git a/src/test/ui/parser/lex-bad-binary-literal.stderr b/src/test/ui/lexer/lex-bad-binary-literal.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-binary-literal.stderr
rename to src/test/ui/lexer/lex-bad-binary-literal.stderr
diff --git a/src/test/ui/parser/lex-bad-char-literals-1.rs b/src/test/ui/lexer/lex-bad-char-literals-1.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-1.rs
rename to src/test/ui/lexer/lex-bad-char-literals-1.rs
diff --git a/src/test/ui/parser/lex-bad-char-literals-1.stderr b/src/test/ui/lexer/lex-bad-char-literals-1.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-1.stderr
rename to src/test/ui/lexer/lex-bad-char-literals-1.stderr
diff --git a/src/test/ui/parser/lex-bad-char-literals-2.rs b/src/test/ui/lexer/lex-bad-char-literals-2.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-2.rs
rename to src/test/ui/lexer/lex-bad-char-literals-2.rs
diff --git a/src/test/ui/parser/lex-bad-char-literals-2.stderr b/src/test/ui/lexer/lex-bad-char-literals-2.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-2.stderr
rename to src/test/ui/lexer/lex-bad-char-literals-2.stderr
diff --git a/src/test/ui/parser/lex-bad-char-literals-3.rs b/src/test/ui/lexer/lex-bad-char-literals-3.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-3.rs
rename to src/test/ui/lexer/lex-bad-char-literals-3.rs
diff --git a/src/test/ui/parser/lex-bad-char-literals-3.stderr b/src/test/ui/lexer/lex-bad-char-literals-3.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-3.stderr
rename to src/test/ui/lexer/lex-bad-char-literals-3.stderr
diff --git a/src/test/ui/parser/lex-bad-char-literals-4.rs b/src/test/ui/lexer/lex-bad-char-literals-4.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-4.rs
rename to src/test/ui/lexer/lex-bad-char-literals-4.rs
diff --git a/src/test/ui/parser/lex-bad-char-literals-4.stderr b/src/test/ui/lexer/lex-bad-char-literals-4.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-4.stderr
rename to src/test/ui/lexer/lex-bad-char-literals-4.stderr
diff --git a/src/test/ui/parser/lex-bad-char-literals-5.rs b/src/test/ui/lexer/lex-bad-char-literals-5.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-5.rs
rename to src/test/ui/lexer/lex-bad-char-literals-5.rs
diff --git a/src/test/ui/parser/lex-bad-char-literals-5.stderr b/src/test/ui/lexer/lex-bad-char-literals-5.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-5.stderr
rename to src/test/ui/lexer/lex-bad-char-literals-5.stderr
diff --git a/src/test/ui/parser/lex-bad-char-literals-6.rs b/src/test/ui/lexer/lex-bad-char-literals-6.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-6.rs
rename to src/test/ui/lexer/lex-bad-char-literals-6.rs
diff --git a/src/test/ui/parser/lex-bad-char-literals-6.stderr b/src/test/ui/lexer/lex-bad-char-literals-6.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-6.stderr
rename to src/test/ui/lexer/lex-bad-char-literals-6.stderr
diff --git a/src/test/ui/parser/lex-bad-char-literals-7.rs b/src/test/ui/lexer/lex-bad-char-literals-7.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-7.rs
rename to src/test/ui/lexer/lex-bad-char-literals-7.rs
diff --git a/src/test/ui/parser/lex-bad-char-literals-7.stderr b/src/test/ui/lexer/lex-bad-char-literals-7.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-char-literals-7.stderr
rename to src/test/ui/lexer/lex-bad-char-literals-7.stderr
diff --git a/src/test/ui/parser/lex-bad-numeric-literals.rs b/src/test/ui/lexer/lex-bad-numeric-literals.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-numeric-literals.rs
rename to src/test/ui/lexer/lex-bad-numeric-literals.rs
diff --git a/src/test/ui/parser/lex-bad-numeric-literals.stderr b/src/test/ui/lexer/lex-bad-numeric-literals.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-numeric-literals.stderr
rename to src/test/ui/lexer/lex-bad-numeric-literals.stderr
diff --git a/src/test/ui/parser/lex-bad-octal-literal.rs b/src/test/ui/lexer/lex-bad-octal-literal.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-octal-literal.rs
rename to src/test/ui/lexer/lex-bad-octal-literal.rs
diff --git a/src/test/ui/parser/lex-bad-octal-literal.stderr b/src/test/ui/lexer/lex-bad-octal-literal.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-octal-literal.stderr
rename to src/test/ui/lexer/lex-bad-octal-literal.stderr
diff --git a/src/test/ui/parser/lex-bad-token.rs b/src/test/ui/lexer/lex-bad-token.rs
similarity index 100%
rename from src/test/ui/parser/lex-bad-token.rs
rename to src/test/ui/lexer/lex-bad-token.rs
diff --git a/src/test/ui/parser/lex-bad-token.stderr b/src/test/ui/lexer/lex-bad-token.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bad-token.stderr
rename to src/test/ui/lexer/lex-bad-token.stderr
diff --git a/src/test/ui/parser/lex-bare-cr-nondoc-comment.rs b/src/test/ui/lexer/lex-bare-cr-nondoc-comment.rs
similarity index 100%
rename from src/test/ui/parser/lex-bare-cr-nondoc-comment.rs
rename to src/test/ui/lexer/lex-bare-cr-nondoc-comment.rs
diff --git a/src/test/ui/parser/lex-bare-cr-string-literal-doc-comment.rs b/src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.rs
similarity index 100%
rename from src/test/ui/parser/lex-bare-cr-string-literal-doc-comment.rs
rename to src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.rs
diff --git a/src/test/ui/parser/lex-bare-cr-string-literal-doc-comment.stderr b/src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr
similarity index 100%
rename from src/test/ui/parser/lex-bare-cr-string-literal-doc-comment.stderr
rename to src/test/ui/lexer/lex-bare-cr-string-literal-doc-comment.stderr
diff --git a/src/test/ui/parser/lex-stray-backslash.rs b/src/test/ui/lexer/lex-stray-backslash.rs
similarity index 100%
rename from src/test/ui/parser/lex-stray-backslash.rs
rename to src/test/ui/lexer/lex-stray-backslash.rs
diff --git a/src/test/ui/parser/lex-stray-backslash.stderr b/src/test/ui/lexer/lex-stray-backslash.stderr
similarity index 100%
rename from src/test/ui/parser/lex-stray-backslash.stderr
rename to src/test/ui/lexer/lex-stray-backslash.stderr
diff --git a/src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/ui/lexer/lexer-crlf-line-endings-string-literal-doc-comment.rs
similarity index 100%
rename from src/test/ui/parser/lexer-crlf-line-endings-string-literal-doc-comment.rs
rename to src/test/ui/lexer/lexer-crlf-line-endings-string-literal-doc-comment.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 7fae9bf0f69..203e33e8b1f 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -7,9 +7,8 @@ use std::path::Path;
 
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
-const ROOT_ENTRY_LIMIT: usize = 983;
+const ROOT_ENTRY_LIMIT: usize = 982;
 const ISSUES_ENTRY_LIMIT: usize = 2310;
-const PARSER_LIMIT: usize = 1012;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))
@@ -22,13 +21,10 @@ fn check_entries(path: &Path, bad: &mut bool) {
             // Use special values for these dirs.
             let is_root = path.join("test/ui") == dir_path;
             let is_issues_dir = path.join("test/ui/issues") == dir_path;
-            let is_parser = path.join("test/ui/parser") == dir_path;
             let limit = if is_root {
                 ROOT_ENTRY_LIMIT
             } else if is_issues_dir {
                 ISSUES_ENTRY_LIMIT
-            } else if is_parser {
-                PARSER_LIMIT
             } else {
                 ENTRY_LIMIT
             };