diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8c89be578..0e1edfc42 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1084,18 +1084,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleGeneratorTest")
   ENDIF(APPLE AND CTEST_TEST_CPACK)
 
-  ADD_TEST(WorkingDirectory ${CMAKE_CTEST_COMMAND}
+  ADD_TEST(TestsWorkingDirectory ${CMAKE_CTEST_COMMAND}
     --build-and-test
-    "${CMake_SOURCE_DIR}/Tests/WorkingDirectory"
-    "${CMake_BINARY_DIR}/Tests/WorkingDirectory"
+    "${CMake_SOURCE_DIR}/Tests/TestsWorkingDirectory"
+    "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory"
     --build-generator ${CMAKE_TEST_GENERATOR}
-    --build-project WorkingDirectoryProj
+    --build-project TestsWorkingDirectoryProj
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-    --build-exe-dir "${CMake_BINARY_DIR}/Tests/WorkingDirectory"
+    --build-exe-dir "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory"
     --force-new-ctest-process
     --test-command ${CMAKE_CTEST_COMMAND} -V
     )
-  LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WorkingDirectory")
+  LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/TestsWorkingDirectory")
 
   # Make sure CTest can handle a test with no newline in output.
   ADD_TEST(CTest.NoNewline
diff --git a/Tests/WorkingDirectory/CMakeLists.txt b/Tests/TestsWorkingDirectory/CMakeLists.txt
similarity index 100%
rename from Tests/WorkingDirectory/CMakeLists.txt
rename to Tests/TestsWorkingDirectory/CMakeLists.txt
diff --git a/Tests/WorkingDirectory/main.cxx b/Tests/TestsWorkingDirectory/main.cxx
similarity index 100%
rename from Tests/WorkingDirectory/main.cxx
rename to Tests/TestsWorkingDirectory/main.cxx