diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index d38c37f75..37c7897bf 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -263,7 +263,7 @@ IF(BUILD_TESTING)
     --test-command   ${SimpleInstallInstallDir}/bin/SimpleInstall)
   ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND}
     --build-and-test 
-    "${CMake_SOURCE_DIR}/Tests/SimpleInstall"
+    "${CMake_SOURCE_DIR}/Tests/SimpleInstallS2"
     "${CMake_BINARY_DIR}/Tests/SimpleInstallS2"
     --build-generator ${CMAKE_GENERATOR}
     --build-project TestSimpleInstall
@@ -296,7 +296,7 @@ IF(BUILD_TESTING)
 
   ADD_TEST(LoadedCommandOneConfig  ${CMAKE_CTEST_COMMAND}
     --build-and-test 
-    "${CMake_SOURCE_DIR}/Tests/LoadCommand"
+    "${CMake_SOURCE_DIR}/Tests/LoadCommandOneConfig"
     "${CMake_BINARY_DIR}/Tests/LoadCommandOneConfig"
     --build-generator ${CMAKE_GENERATOR}
     --build-project LoadedCommand
@@ -324,7 +324,7 @@ IF(BUILD_TESTING)
 
     ADD_TEST(complexOneConfig  ${CMAKE_CTEST_COMMAND}
       --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/Complex"
+      "${CMake_SOURCE_DIR}/Tests/ComplexOneConfig"
       "${CMake_BINARY_DIR}/Tests/ComplexOneConfig"
       --build-generator ${CMAKE_GENERATOR}
       --build-project complex
@@ -334,7 +334,7 @@ IF(BUILD_TESTING)
 
     ADD_TEST(complexRelativePaths  ${CMAKE_CTEST_COMMAND}
       --build-and-test
-      "${CMake_SOURCE_DIR}/Tests/Complex"
+      "${CMake_SOURCE_DIR}/Tests/ComplexRelativePaths"
       "${CMake_BINARY_DIR}/Tests/ComplexRelativePaths"
       --build-generator ${CMAKE_GENERATOR}
       --build-project complex
diff --git a/Tests/Complex/Executable/complex.cxx b/Tests/Complex/Executable/complex.cxx
index 2d4bd51c7..29bf4cdda 100644
--- a/Tests/Complex/Executable/complex.cxx
+++ b/Tests/Complex/Executable/complex.cxx
@@ -558,14 +558,16 @@ int main()
   cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
          "FILENAME_VAR_PATH_NAME is not defined.");
 #else
-  if(strcmp(FILENAME_VAR_PATH_NAME, "Complex") != 0)
+  if((strcmp(FILENAME_VAR_PATH_NAME, "Complex") == 0) ||
+     (strcmp(FILENAME_VAR_PATH_NAME, "ComplexOneConfig") == 0) ||
+     (strcmp(FILENAME_VAR_PATH_NAME, "ComplexRelativePaths") == 0))
     {
-    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
-           "FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
+    cmPassed("FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
     }
   else
     {
-    cmPassed("FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
+    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
+           "FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
     }
 #endif
 
@@ -618,14 +620,16 @@ int main()
   cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
          "PATH_VAR_NAME is not defined.");
 #else
-  if(strcmp(PATH_VAR_NAME, "Complex") != 0)
+  if((strcmp(PATH_VAR_NAME, "Complex") == 0) ||
+     (strcmp(PATH_VAR_NAME, "ComplexOneConfig") == 0) ||
+     (strcmp(PATH_VAR_NAME, "ComplexRelativePaths") == 0))
     {
-    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
-           "PATH_VAR_NAME == ", PATH_VAR_NAME);
+    cmPassed("PATH_VAR_NAME == ", PATH_VAR_NAME);
     }
   else
     {
-    cmPassed("PATH_VAR_NAME == ", PATH_VAR_NAME);
+    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
+           "PATH_VAR_NAME == ", PATH_VAR_NAME);
     }
 #endif
 
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx
index 2d4bd51c7..29bf4cdda 100644
--- a/Tests/ComplexOneConfig/Executable/complex.cxx
+++ b/Tests/ComplexOneConfig/Executable/complex.cxx
@@ -558,14 +558,16 @@ int main()
   cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
          "FILENAME_VAR_PATH_NAME is not defined.");
 #else
-  if(strcmp(FILENAME_VAR_PATH_NAME, "Complex") != 0)
+  if((strcmp(FILENAME_VAR_PATH_NAME, "Complex") == 0) ||
+     (strcmp(FILENAME_VAR_PATH_NAME, "ComplexOneConfig") == 0) ||
+     (strcmp(FILENAME_VAR_PATH_NAME, "ComplexRelativePaths") == 0))
     {
-    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
-           "FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
+    cmPassed("FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
     }
   else
     {
-    cmPassed("FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
+    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
+           "FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
     }
 #endif
 
@@ -618,14 +620,16 @@ int main()
   cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
          "PATH_VAR_NAME is not defined.");
 #else
-  if(strcmp(PATH_VAR_NAME, "Complex") != 0)
+  if((strcmp(PATH_VAR_NAME, "Complex") == 0) ||
+     (strcmp(PATH_VAR_NAME, "ComplexOneConfig") == 0) ||
+     (strcmp(PATH_VAR_NAME, "ComplexRelativePaths") == 0))
     {
-    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
-           "PATH_VAR_NAME == ", PATH_VAR_NAME);
+    cmPassed("PATH_VAR_NAME == ", PATH_VAR_NAME);
     }
   else
     {
-    cmPassed("PATH_VAR_NAME == ", PATH_VAR_NAME);
+    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
+           "PATH_VAR_NAME == ", PATH_VAR_NAME);
     }
 #endif
 
diff --git a/Tests/ComplexRelativePaths/Executable/complex.cxx b/Tests/ComplexRelativePaths/Executable/complex.cxx
index 2d4bd51c7..29bf4cdda 100644
--- a/Tests/ComplexRelativePaths/Executable/complex.cxx
+++ b/Tests/ComplexRelativePaths/Executable/complex.cxx
@@ -558,14 +558,16 @@ int main()
   cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
          "FILENAME_VAR_PATH_NAME is not defined.");
 #else
-  if(strcmp(FILENAME_VAR_PATH_NAME, "Complex") != 0)
+  if((strcmp(FILENAME_VAR_PATH_NAME, "Complex") == 0) ||
+     (strcmp(FILENAME_VAR_PATH_NAME, "ComplexOneConfig") == 0) ||
+     (strcmp(FILENAME_VAR_PATH_NAME, "ComplexRelativePaths") == 0))
     {
-    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
-           "FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
+    cmPassed("FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
     }
   else
     {
-    cmPassed("FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
+    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
+           "FILENAME_VAR_PATH_NAME == ", FILENAME_VAR_PATH_NAME);
     }
 #endif
 
@@ -618,14 +620,16 @@ int main()
   cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
          "PATH_VAR_NAME is not defined.");
 #else
-  if(strcmp(PATH_VAR_NAME, "Complex") != 0)
+  if((strcmp(PATH_VAR_NAME, "Complex") == 0) ||
+     (strcmp(PATH_VAR_NAME, "ComplexOneConfig") == 0) ||
+     (strcmp(PATH_VAR_NAME, "ComplexRelativePaths") == 0))
     {
-    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
-           "PATH_VAR_NAME == ", PATH_VAR_NAME);
+    cmPassed("PATH_VAR_NAME == ", PATH_VAR_NAME);
     }
   else
     {
-    cmPassed("PATH_VAR_NAME == ", PATH_VAR_NAME);
+    cmFailed("the FIND_FILE or GET_FILENAME_COMPONENT command is broken, "
+           "PATH_VAR_NAME == ", PATH_VAR_NAME);
     }
 #endif