diff --git a/clang-tools-extra/test/clang-tidy/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-c.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-c.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-c.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-c.h
diff --git a/clang-tools-extra/test/clang-tidy/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-cxx.h b/clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-cxx.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-cxx.h
rename to clang-tools-extra/test/clang-tidy/checkers/Inputs/bugprone-not-null-terminated-result/not-null-terminated-result-cxx.h
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-bad-signal-to-kill-thread.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-bad-signal-to-kill-thread.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-bad-signal-to-kill-thread.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-in-initialization-strlen.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-in-initialization-strlen.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-in-initialization-strlen.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-in-initialization-strlen.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-before-safe.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-before-safe.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-before-safe.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-before-safe.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-cxx.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-safe-other.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-other.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-safe-other.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe-other.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-safe.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-memcpy-safe.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-memcpy-safe.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-strlen.c b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-strlen.c
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-strlen.c
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-strlen.c
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-wcslen.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wcslen.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-wcslen.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wcslen.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-not-null-terminated-result-wmemcpy-safe-cxx.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-constexpr.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-constexpr.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/bugprone-suspicious-semicolon-constexpr.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-semicolon-constexpr.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-magic-numbers-userliteral.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-userliteral.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/readability-magic-numbers-userliteral.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-magic-numbers-userliteral.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-make-member-function-const.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-make-member-function-const.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/readability-make-member-function-const.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-make-member-function-const.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-access-specifiers-check-first-declaration.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers-check-first-declaration.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/readability-redundant-access-specifiers-check-first-declaration.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers-check-first-declaration.cpp
diff --git a/clang-tools-extra/test/clang-tidy/readability-redundant-access-specifiers.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers.cpp
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/readability-redundant-access-specifiers.cpp
rename to clang-tools-extra/test/clang-tidy/checkers/readability-redundant-access-specifiers.cpp