diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index badc76b66..2c5acd963 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -241,8 +241,6 @@ IF(BUILD_TESTING)
 
   ADD_TEST_MACRO(Module.GenerateExportHeader GenerateExportHeader)
 
-  ADD_TEST_MACRO(Module.CheckCXXCompilerFlag CheckCXXCompilerFlag)
-
   ADD_TEST(LinkFlags-prepare
     ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE}
     --build-and-test
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index 20e6a3aba..2209b2017 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -15,4 +15,6 @@ add_CMakeOnly_test(CheckSymbolExists)
 
 add_CMakeOnly_test(CheckCXXSymbolExists)
 
+add_CMakeOnly_test(CheckCXXCompilerFlag)
+
 add_CMakeOnly_test(AllFindModules)
diff --git a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt b/Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt
similarity index 86%
rename from Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
rename to Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt
index 77f50060f..e205330b0 100644
--- a/Tests/Module/CheckCXXCompilerFlag/CMakeLists.txt
+++ b/Tests/CMakeOnly/CheckCXXCompilerFlag/CMakeLists.txt
@@ -56,19 +56,3 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 else()
   message("Unhandled Platform")
 endif()
-
-#
-# This is a no-op executable... If this test is going to fail, it fails during
-# the configure step while cmake is configuring this CMakeLists.txt file...
-#
-
-file(WRITE
-  "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
-  "int main() { return 0; }
-"
-)
-
-add_executable(
-  CheckCXXCompilerFlag
-  "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
-)