Index: flang/CMakeLists.txt
===================================================================
--- flang/CMakeLists.txt
+++ flang/CMakeLists.txt
@@ -50,6 +50,7 @@
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   message("Building Flang as a standalone project.")
   project(Flang)
+  set(FLANG_STANDALONE_BUILD ON)
 
   set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
   if (NOT MSVC_IDE)
@@ -179,6 +180,7 @@
   endif()
 
 else()
+  set(FLANG_STANDALONE_BUILD OFF)
   option(FLANG_INCLUDE_TESTS
          "Generate build targets for the Flang unit tests."
          ${LLVM_INCLUDE_TESTS})
Index: flang/test/CMakeLists.txt
===================================================================
--- flang/test/CMakeLists.txt
+++ flang/test/CMakeLists.txt
@@ -45,7 +45,13 @@
 )
 set_target_properties(check-flang PROPERTIES FOLDER "Tests")
 
-add_lit_testsuites(FLANG ${CMAKE_CURRENT_SOURCE_DIR}
-  PARAMS ${FLANG_TEST_PARAMS}
-  DEPENDS ${FLANG_TEST_DEPENDS})
-
+# In case of standalone builds.
+if (FLANG_STANDALONE_BUILD)
+  add_lit_testsuites(FLANG ${CMAKE_CURRENT_BINARY_DIR}
+    PARAMS ${FLANG_TEST_PARAMS}
+    DEPENDS ${FLANG_TEST_DEPENDS})
+else()
+  add_lit_testsuites(FLANG ${CMAKE_CURRENT_SOURCE_DIR}
+    PARAMS ${FLANG_TEST_PARAMS}
+    DEPENDS ${FLANG_TEST_DEPENDS})
+endif()