diff --git a/Tests/RunCMake/BuildDepends/LinkDepends.cmake b/Tests/RunCMake/BuildDepends/LinkDepends.cmake
index a414e03597..72a2b1b37c 100644
--- a/Tests/RunCMake/BuildDepends/LinkDepends.cmake
+++ b/Tests/RunCMake/BuildDepends/LinkDepends.cmake
@@ -1,19 +1,17 @@
-
 enable_language(C)
 
 include("${CMAKE_BINARY_DIR}/../LinkDependsExternalLibrary-build/ExternalLibrary-debug.cmake")
 cmake_path(GET EXTERNAL_LIBRARY PARENT_PATH EXTERNAL_DIR)
 
-add_library(LinkDependsLib SHARED "${CMAKE_CURRENT_BINARY_DIR}/lib_depends.c")
+add_library(LinkDependsLib SHARED LinkDependsLib.c)
 target_link_directories(LinkDependsLib PRIVATE "${EXTERNAL_DIR}")
 target_link_libraries(LinkDependsLib PRIVATE External)
 
-add_executable(LinkDependsExe "${CMAKE_CURRENT_BINARY_DIR}/exe_depends.c")
+add_executable(LinkDependsExe LinkDependsExe.c)
 target_link_directories(LinkDependsExe PRIVATE "${EXTERNAL_DIR}")
 target_link_libraries(LinkDependsExe PRIVATE External)
 
-
-file(GENERATE  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/check-$<LOWER_CASE:$<CONFIG>>.cmake"
+file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/check-$<LOWER_CASE:$<CONFIG>>.cmake"
   CONTENT "
 set(check_pairs
   \"$<TARGET_FILE:LinkDependsLib>|${EXTERNAL_LIBRARY}\"
diff --git a/Tests/RunCMake/BuildDepends/LinkDepends.step1.cmake b/Tests/RunCMake/BuildDepends/LinkDepends.step1.cmake
deleted file mode 100644
index 5ce55b0177..0000000000
--- a/Tests/RunCMake/BuildDepends/LinkDepends.step1.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-
-file(WRITE "${RunCMake_TEST_BINARY_DIR}/lib_depends.c" [[
-
-extern void external(void);
-
-void lib_depends(void)
-{
-  external();
-}
-]])
-
-
-file(WRITE "${RunCMake_TEST_BINARY_DIR}/exe_depends.c" [[
-
-extern void external(void);
-
-int main(void)
-{
-  external();
-
-  return 0;
-}
-]])
diff --git a/Tests/RunCMake/BuildDepends/LinkDependsExe.c b/Tests/RunCMake/BuildDepends/LinkDependsExe.c
new file mode 100644
index 0000000000..8429386812
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/LinkDependsExe.c
@@ -0,0 +1,5 @@
+extern int external(void);
+int main(void)
+{
+  return external();
+}
diff --git a/Tests/RunCMake/BuildDepends/LinkDependsLib.c b/Tests/RunCMake/BuildDepends/LinkDependsLib.c
new file mode 100644
index 0000000000..afde58ee1b
--- /dev/null
+++ b/Tests/RunCMake/BuildDepends/LinkDependsLib.c
@@ -0,0 +1,5 @@
+extern int external(void);
+int use_external(void)
+{
+  return external();
+}