diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterface-result.txt b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-result.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/FileSetModulesInterface-result.txt
rename to Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-result.txt
diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt
similarity index 66%
rename from Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt
rename to Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt
index 7269c65df9..7d099dedba 100644
--- a/Tests/RunCMake/CXXModules/FileSetModulesInterface-stderr.txt
+++ b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic-stderr.txt
@@ -1,4 +1,4 @@
-CMake Error at FileSetModulesInterface.cmake:[0-9]+ \(target_sources\):
+CMake Error at FileSetModulesInterfaceOnStatic.cmake:[0-9]+ \(target_sources\):
   target_sources File set TYPE "CXX_MODULES" may not have "INTERFACE"
   visibility
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/CXXModules/FileSetModulesInterface.cmake b/Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/FileSetModulesInterface.cmake
rename to Tests/RunCMake/CXXModules/FileSetModulesInterfaceOnStatic.cmake
diff --git a/Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake b/Tests/RunCMake/CXXModules/FileSetModulesPrivateOnStatic.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/FileSetModulesPrivate.cmake
rename to Tests/RunCMake/CXXModules/FileSetModulesPrivateOnStatic.cmake
diff --git a/Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake b/Tests/RunCMake/CXXModules/FileSetModulesPublicOnStatic.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/FileSetModulesPublic.cmake
rename to Tests/RunCMake/CXXModules/FileSetModulesPublicOnStatic.cmake
diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
index 8b7bc8628b..0413793776 100644
--- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
@@ -71,9 +71,14 @@ set(scopes
   Interface
   Private
   Public)
+set(target_types
+  Static
+  )
 foreach (fileset_type IN LISTS fileset_types)
   foreach (scope IN LISTS scopes)
-    run_cmake("FileSet${fileset_type}${scope}")
+    foreach (target_type IN LISTS target_types)
+      run_cmake("FileSet${fileset_type}${scope}On${target_type}")
+    endforeach ()
   endforeach ()
   run_cmake("FileSet${fileset_type}InterfaceImported")