diff --git a/Tests/RunCMake/BuildDepends/CompileDepends.c b/Tests/RunCMake/BuildDepends/CompileDepends.c
new file mode 100644
index 0000000000..b627738e53
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/CompileDepends.c
@@ -0,0 +1,5 @@
+#include <CompileDepends.h>
+int main(void)
+{
+  return COUNT;
+}
diff --git a/Tests/RunCMake/BuildDepends/CompilerDependencies.cmake b/Tests/RunCMake/BuildDepends/CompileDepends.cmake
similarity index 75%
rename from Tests/RunCMake/BuildDepends/CompilerDependencies.cmake
rename to Tests/RunCMake/BuildDepends/CompileDepends.cmake
index 8a9e6008bc..f4987ed42b 100644
--- a/Tests/RunCMake/BuildDepends/CompilerDependencies.cmake
+++ b/Tests/RunCMake/BuildDepends/CompileDepends.cmake
@@ -1,11 +1,12 @@
 enable_language(C)
 
-add_executable(main ${CMAKE_CURRENT_BINARY_DIR}/main.c)
+add_executable(main CompileDepends.c)
+target_include_directories(main PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/check-$<LOWER_CASE:$<CONFIG>>.cmake CONTENT "
+cmake_minimum_required(VERSION ${CMAKE_VERSION})
 set(check_pairs
-  \"$<TARGET_FILE:main>|${CMAKE_CURRENT_BINARY_DIR}/main.c\"
-  \"$<TARGET_FILE:main>|${CMAKE_CURRENT_BINARY_DIR}/main.h\"
+  \"$<TARGET_FILE:main>|${CMAKE_CURRENT_BINARY_DIR}/CompileDepends.h\"
   )
 set(check_exes
   \"$<TARGET_FILE:main>\"
@@ -35,9 +36,9 @@ if (check_step EQUAL 2)
         else()
           string(REPLACE \"\\\\ \" \" \" DEPENDS_CONTENT \"\${DEPENDS_CONTENT}\")
         endif()
-        if(NOT DEPENDS_CONTENT MATCHES \"\${OBJECT_FILE} *:.+main.c\"
-            OR NOT DEPENDS_CONTENT MATCHES \"main.h\")
-          set(RunCMake_TEST_FAILED \"Dependency file '\${TARGET_DEP_FILE}' badly generated.\")
+        if(NOT DEPENDS_CONTENT MATCHES \"\${OBJECT_FILE} *:.+[Cc]ompile[Dd]epends.c\"
+            OR NOT DEPENDS_CONTENT MATCHES \"[Cc]ompile[Dd]epends.h\")
+          set(RunCMake_TEST_FAILED \"Dependency file badly generated:\n  \${TARGET_DEP_FILE}\")
         endif()
       endif()
     endif()
diff --git a/Tests/RunCMake/BuildDepends/CompileDepends.step1.cmake b/Tests/RunCMake/BuildDepends/CompileDepends.step1.cmake
new file mode 100644
index 0000000000..63ac0d631d
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/CompileDepends.step1.cmake
@@ -0,0 +1,3 @@
+file(WRITE "${RunCMake_TEST_BINARY_DIR}/CompileDepends.h" [[
+#define COUNT 1
+]])
diff --git a/Tests/RunCMake/BuildDepends/CompileDepends.step2.cmake b/Tests/RunCMake/BuildDepends/CompileDepends.step2.cmake
new file mode 100644
index 0000000000..5b57df00d0
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/CompileDepends.step2.cmake
@@ -0,0 +1,3 @@
+file(WRITE "${RunCMake_TEST_BINARY_DIR}/CompileDepends.h" [[
+#define COUNT 2
+]])
diff --git a/Tests/RunCMake/BuildDepends/CompilerDependencies.step1.cmake b/Tests/RunCMake/BuildDepends/CompilerDependencies.step1.cmake
deleted file mode 100644
index 1da2593cde..0000000000
--- a/Tests/RunCMake/BuildDepends/CompilerDependencies.step1.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-file(WRITE "${RunCMake_TEST_BINARY_DIR}/main.h" [[
-#define COUNT 1
-]])
-
-file(WRITE "${RunCMake_TEST_BINARY_DIR}/main.c" [[
-#include "main.h"
-
-int main(void) { return COUNT; }
-]])
diff --git a/Tests/RunCMake/BuildDepends/CompilerDependencies.step2.cmake b/Tests/RunCMake/BuildDepends/CompilerDependencies.step2.cmake
deleted file mode 100644
index e983665f87..0000000000
--- a/Tests/RunCMake/BuildDepends/CompilerDependencies.step2.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-file(WRITE "${RunCMake_TEST_BINARY_DIR}/main.h" [[
-#define COUNT 2
-]])
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
index d5be8074fe..3df419a8b7 100644
--- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
+++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake
@@ -171,7 +171,7 @@ if ((RunCMake_GENERATOR STREQUAL "Unix Makefiles"
     OR (RunCMake_GENERATOR STREQUAL "NMake Makefiles"
       AND MSVC_VERSION GREATER 1300
       AND CMAKE_C_COMPILER_ID STREQUAL "MSVC"))
-  run_BuildDepends(CompilerDependencies)
+  run_BuildDepends(CompileDepends)
   run_BuildDepends(CustomCommandDependencies)
 endif()