diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/system/string.h b/clang-tools-extra/test/clang-tidy/checkers/misc/Inputs/system/string.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc/system/string.h
rename to clang-tools-extra/test/clang-tidy/checkers/misc/Inputs/system/string.h
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/system/vector.h b/clang-tools-extra/test/clang-tidy/checkers/misc/Inputs/system/vector.h
similarity index 100%
rename from clang-tools-extra/test/clang-tidy/checkers/misc/system/vector.h
rename to clang-tools-extra/test/clang-tidy/checkers/misc/Inputs/system/vector.h
diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
index 0f4c7a8f4ad1c..ed12600d96911 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/misc/include-cleaner.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy %s misc-include-cleaner %t -- -- -I%S/Inputs -isystem%S/system
+// RUN: %check_clang_tidy %s misc-include-cleaner %t -- -- -I%S/Inputs -isystem%S/Inputs/system
 #include "bar.h"
 // CHECK-FIXES: {{^}}#include "baz.h"{{$}}
 #include "foo.h"