diff --git a/Tests/Complex/CMakeLists.txt b/Tests/Complex/CMakeLists.txt
index 4b05d0726c..d9c756822d 100644
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@@ -3,6 +3,11 @@
 #
 PROJECT (Complex)
 
+IF(BORLAND)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -tWR")
+  SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -tWR")
+ENDIF(BORLAND)
+
 #
 # Define a macro
 #
diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt
index ce3619d89b..2779fcb19c 100644
--- a/Tests/Complex/Executable/CMakeLists.txt
+++ b/Tests/Complex/Executable/CMakeLists.txt
@@ -22,7 +22,7 @@ IF(WIN32)
   IF (CMAKE_DLL)
     CONFIGURE_FILE(
         ${CMAKE_DLL}
-        ${Complex_BINARY_DIR}/CMakeLib.dll COPYONLY)
+        ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY)
   ENDIF (CMAKE_DLL)
 ENDIF (WIN32)
 
diff --git a/Tests/ComplexOneConfig/CMakeLists.txt b/Tests/ComplexOneConfig/CMakeLists.txt
index 4b05d0726c..d9c756822d 100644
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@@ -3,6 +3,11 @@
 #
 PROJECT (Complex)
 
+IF(BORLAND)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -tWR")
+  SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -tWR")
+ENDIF(BORLAND)
+
 #
 # Define a macro
 #
diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
index ce3619d89b..2779fcb19c 100644
--- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt
@@ -22,7 +22,7 @@ IF(WIN32)
   IF (CMAKE_DLL)
     CONFIGURE_FILE(
         ${CMAKE_DLL}
-        ${Complex_BINARY_DIR}/CMakeLib.dll COPYONLY)
+        ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY)
   ENDIF (CMAKE_DLL)
 ENDIF (WIN32)
 
diff --git a/Tests/ComplexRelativePaths/CMakeLists.txt b/Tests/ComplexRelativePaths/CMakeLists.txt
index 4b05d0726c..d9c756822d 100644
--- a/Tests/ComplexRelativePaths/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/CMakeLists.txt
@@ -3,6 +3,11 @@
 #
 PROJECT (Complex)
 
+IF(BORLAND)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -tWR")
+  SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -tWR")
+ENDIF(BORLAND)
+
 #
 # Define a macro
 #
diff --git a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
index ce3619d89b..2779fcb19c 100644
--- a/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/Executable/CMakeLists.txt
@@ -22,7 +22,7 @@ IF(WIN32)
   IF (CMAKE_DLL)
     CONFIGURE_FILE(
         ${CMAKE_DLL}
-        ${Complex_BINARY_DIR}/CMakeLib.dll COPYONLY)
+        ${Complex_BINARY_DIR}/bin/CMakeLib.dll COPYONLY)
   ENDIF (CMAKE_DLL)
 ENDIF (WIN32)