diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 8652a5c4e2..880776be0d 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -719,6 +719,7 @@ foreach(var
     list(APPEND file-DOWNLOAD_ARGS -D${var}=${${var}})
   endif()
 endforeach()
+add_RunCMake_test(file-CREATE_LINK)
 add_RunCMake_test(file-DOWNLOAD)
 add_RunCMake_test(file-MAKE_DIRECTORY)
 add_RunCMake_test(file-RPATH
diff --git a/Tests/RunCMake/file-CREATE_LINK/CMakeLists.txt b/Tests/RunCMake/file-CREATE_LINK/CMakeLists.txt
new file mode 100644
index 0000000000..39da7034a3
--- /dev/null
+++ b/Tests/RunCMake/file-CREATE_LINK/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 4.1)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/file/CREATE_LINK-COPY_ON_ERROR.cmake b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-COPY_ON_ERROR.cmake
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-COPY_ON_ERROR.cmake
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-COPY_ON_ERROR.cmake
diff --git a/Tests/RunCMake/file/CREATE_LINK-SYMBOLIC-noexist.cmake b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-SYMBOLIC-noexist.cmake
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-SYMBOLIC-noexist.cmake
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-SYMBOLIC-noexist.cmake
diff --git a/Tests/RunCMake/file/CREATE_LINK-SYMBOLIC.cmake b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-SYMBOLIC.cmake
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-SYMBOLIC.cmake
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-SYMBOLIC.cmake
diff --git a/Tests/RunCMake/file/CREATE_LINK-noarg-result.txt b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noarg-result.txt
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-noarg-result.txt
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noarg-result.txt
diff --git a/Tests/RunCMake/file/CREATE_LINK-noarg-stderr.txt b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noarg-stderr.txt
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-noarg-stderr.txt
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noarg-stderr.txt
diff --git a/Tests/RunCMake/file/CREATE_LINK-noarg.cmake b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noarg.cmake
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-noarg.cmake
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noarg.cmake
diff --git a/Tests/RunCMake/file/CREATE_LINK-noexist-stderr.txt b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noexist-stderr.txt
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-noexist-stderr.txt
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noexist-stderr.txt
diff --git a/Tests/RunCMake/file/CREATE_LINK-noexist.cmake b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noexist.cmake
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK-noexist.cmake
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK-noexist.cmake
diff --git a/Tests/RunCMake/file/CREATE_LINK.cmake b/Tests/RunCMake/file-CREATE_LINK/CREATE_LINK.cmake
similarity index 100%
rename from Tests/RunCMake/file/CREATE_LINK.cmake
rename to Tests/RunCMake/file-CREATE_LINK/CREATE_LINK.cmake
diff --git a/Tests/RunCMake/file-CREATE_LINK/RunCMakeTest.cmake b/Tests/RunCMake/file-CREATE_LINK/RunCMakeTest.cmake
new file mode 100644
index 0000000000..9f79faec50
--- /dev/null
+++ b/Tests/RunCMake/file-CREATE_LINK/RunCMakeTest.cmake
@@ -0,0 +1,13 @@
+include(RunCMake)
+
+run_cmake(CREATE_LINK)
+run_cmake(CREATE_LINK-COPY_ON_ERROR)
+run_cmake(CREATE_LINK-noarg)
+run_cmake(CREATE_LINK-noexist)
+
+if(NOT WIN32
+    AND NOT MSYS # FIXME: This works on CYGWIN but not on MSYS
+    )
+  run_cmake(CREATE_LINK-SYMBOLIC)
+  run_cmake(CREATE_LINK-SYMBOLIC-noexist)
+endif()
diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake
index 38ec2acd33..57c191bf53 100644
--- a/Tests/RunCMake/file/RunCMakeTest.cmake
+++ b/Tests/RunCMake/file/RunCMakeTest.cmake
@@ -1,9 +1,5 @@
 include(RunCMake)
 
-run_cmake(CREATE_LINK)
-run_cmake(CREATE_LINK-COPY_ON_ERROR)
-run_cmake(CREATE_LINK-noarg)
-run_cmake(CREATE_LINK-noexist)
 run_cmake(TOUCH)
 run_cmake(TOUCH-error-in-source-directory)
 run_cmake(TOUCH-error-missing-directory)
@@ -87,8 +83,6 @@ run_cmake_command(GLOB-error-CONFIGURE_DEPENDS-SCRIPT_MODE ${CMAKE_COMMAND} -P
 if(NOT WIN32
     AND NOT MSYS # FIXME: This works on CYGWIN but not on MSYS
     )
-  run_cmake(CREATE_LINK-SYMBOLIC)
-  run_cmake(CREATE_LINK-SYMBOLIC-noexist)
   run_cmake(GLOB_RECURSE-cyclic-recursion)
   run_cmake(INSTALL-SYMLINK)
   run_cmake(READ_SYMLINK)