Index: cfe/trunk/test/CMakeLists.txt
===================================================================
--- cfe/trunk/test/CMakeLists.txt
+++ cfe/trunk/test/CMakeLists.txt
@@ -46,21 +46,23 @@
 endif ()
 
 list(APPEND CLANG_TEST_DEPS
-  clang clang-resource-headers
+  c-index-test
+  clang
+  clang-resource-headers
+  clang-check
   clang-format
-  c-index-test diagtool
   clang-tblgen
   clang-offload-bundler
   clang-import-test
   clang-rename
   clang-refactor
   clang-diff
+  diagtool
   hmaptool
   )
   
 if(CLANG_ENABLE_STATIC_ANALYZER)
   list(APPEND CLANG_TEST_DEPS
-    clang-check
     clang-extdef-mapping
     )
 endif()
Index: llvm/trunk/utils/gn/secondary/clang/test/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang/test/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang/test/BUILD.gn
@@ -108,6 +108,7 @@
     ":lit_unit_site_cfg",
     "//clang/lib/Headers",
     "//clang/tools/c-index-test",
+    "//clang/tools/clang-check",
     "//clang/tools/clang-diff",
     "//clang/tools/clang-format",
     "//clang/tools/clang-import-test",
@@ -147,7 +148,6 @@
   }
   if (clang_enable_static_analyzer) {
     deps += [
-      "//clang/tools/clang-check",
       "//clang/tools/clang-extdef-mapping",
     ]
   }