diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2955db25f..4d9686632 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -139,6 +139,7 @@ add_RunCMake_test(GeneratorToolset)
 add_RunCMake_test(GNUInstallDirs)
 add_RunCMake_test(TargetPropertyGeneratorExpressions)
 add_RunCMake_test(Languages)
+add_RunCMake_test(LinkStatic)
 add_RunCMake_test(ObjectLibrary)
 add_RunCMake_test(Swift)
 add_RunCMake_test(TargetObjects)
diff --git a/Tests/RunCMake/LinkStatic/CMakeLists.txt b/Tests/RunCMake/LinkStatic/CMakeLists.txt
new file mode 100644
index 000000000..74b3ff8de
--- /dev/null
+++ b/Tests/RunCMake/LinkStatic/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 3.3)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake b/Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake
similarity index 98%
rename from Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake
rename to Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake
index 70d2feea4..6db5c857d 100644
--- a/Tests/RunCMake/set_property/LINK_SEARCH_STATIC.cmake
+++ b/Tests/RunCMake/LinkStatic/LINK_SEARCH_STATIC.cmake
@@ -1,4 +1,4 @@
-project(LinkSearchStatic)
+enable_language(C)
 
 set(CMAKE_LINK_SEARCH_START_STATIC ON)
 add_executable(LinkSearchStartStaticInit1 LinkStatic.c)
diff --git a/Tests/RunCMake/set_property/LinkStatic.c b/Tests/RunCMake/LinkStatic/LinkStatic.c
similarity index 100%
rename from Tests/RunCMake/set_property/LinkStatic.c
rename to Tests/RunCMake/LinkStatic/LinkStatic.c
diff --git a/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake b/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
new file mode 100644
index 000000000..0d2949211
--- /dev/null
+++ b/Tests/RunCMake/LinkStatic/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(LINK_SEARCH_STATIC)
diff --git a/Tests/RunCMake/set_property/RunCMakeTest.cmake b/Tests/RunCMake/set_property/RunCMakeTest.cmake
index ada8804c5..54e63f75c 100644
--- a/Tests/RunCMake/set_property/RunCMakeTest.cmake
+++ b/Tests/RunCMake/set_property/RunCMakeTest.cmake
@@ -1,4 +1,3 @@
 include(RunCMake)
 
 run_cmake(LINK_LIBRARIES)
-run_cmake(LINK_SEARCH_STATIC)