diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
index 43886d57ca5a267a9c7f012a5db9c68d94a2f149..105540f64c940491b76e93ead7c90f3ae2547706 100644
--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
@@ -67,8 +67,6 @@ install(PROGRAMS run-clang-tidy.py
   DESTINATION "${CMAKE_INSTALL_BINDIR}"
   COMPONENT clang-tidy
   RENAME run-clang-tidy)
-if(LLVM_BSPUB_COMMON)
-  install(PROGRAMS clang-tidy-stats.py
-    DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
-    COMPONENT clang-tidy)
-endif()
+install(PROGRAMS clang-tidy-stats.py
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
+  COMPONENT clang-tidy)
diff --git a/clang/test/Driver/prefix.c b/clang/test/Driver/prefix.c
index b429187a49d3f41f7dc9f557b1fe220a8fd2ff18..14dba1dca8981240e3cfc9d251e88461ec7c4e1e 100644
--- a/clang/test/Driver/prefix.c
+++ b/clang/test/Driver/prefix.c
@@ -1,10 +1,10 @@
-// RUN: %clang  %s
-// RUN: %clang  -iprefix $(dirname `which clang`)/../lib/clang/*/   -iwithprefix  include %s
-// RUN: %clang  -iwithprefix include %s
-// RUN: %clang  -nostdinc -iwithprefix include %s -fgcc-compatible
-// RUN: %clang  -nostdinc -iprefix $(dirname `which clang`)/../lib/clang/*/ -iwithprefix  include %s -fgcc-compatible
-// RUN: not %clang -nostdinc   -iwithprefix  include %s
-// RUN: not %clang -nostdinc  -iprefix ""  -iwithprefix  include %s
+// RUN: %clang %s
+// RUN: %clang -iprefix %resource_dir/../ -iwithprefix include %s
+// RUN: %clang -iwithprefix include %s
+// RUN: %clang -nostdinc -iwithprefix include %s -fgcc-compatible
+// RUN: %clang -nostdinc -iprefix %resource_dir/../ -iwithprefix include %s -fgcc-compatible
+// RUN: not %clang -nostdinc -iwithprefix include %s
+// RUN: not %clang -nostdinc -iprefix "" -iwithprefix include %s
 
 #include <stdarg.h>
 int main(void) { return 0; }