diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3944c5db4260dc3a2dbdd544215e54f33c43f946..013fec69fa91825f2c630af9e12b5865e131d206 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -516,7 +516,6 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
   # If kwsys contains the DynamicLoader, need extra library
   IF(KWSYS_USE_DynamicLoader)
     ADD_LIBRARY(testDynload MODULE testDynload.c)
-    GET_TARGET_PROPERTY(TEST_DYNLOAD_LOCATION testDynload LOCATION)
     IF(UNIX)
       TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} ${CMAKE_DL_LIBS})
     ENDIF(UNIX)
diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx
index 8527966b2df1a61d43067dadb62134f2353e9ace..5f0c3b6c21abe132dd0d8fb8dc444fbd34ec551d 100644
--- a/testDynamicLoader.cxx
+++ b/testDynamicLoader.cxx
@@ -31,6 +31,11 @@ kwsys_stl::string GetLibName(const char* lname)
 {
   // Construct proper name of lib
   kwsys_stl::string slname;
+  slname = EXECUTABLE_OUTPUT_PATH;
+#ifdef CMAKE_INTDIR
+  slname += CMAKE_INTDIR;
+  slname += "/";
+#endif
   slname = kwsys::DynamicLoader::LibPrefix();
   slname += lname;
   slname += kwsys::DynamicLoader::LibExtension();
@@ -86,7 +91,7 @@ int main(int , char *[])
   res += TestDynamicLoader("libdl.so", "TestDynamicLoader",1,0,1);
 #endif
   // Now try on the generated library
-  kwsys_stl::string libname = TEST_DYNLOAD_LOCATION; //GetLibName("testDynload");
+  kwsys_stl::string libname = GetLibName("testDynload");
   res += TestDynamicLoader(libname.c_str(), "dummy",1,0,1);
   res += TestDynamicLoader(libname.c_str(), "TestDynamicLoaderFunction",1,1,1);
   res += TestDynamicLoader(libname.c_str(), "_TestDynamicLoaderFunction",1,0,1);
diff --git a/testSystemTools.h.in b/testSystemTools.h.in
index 45119e1cebfab7cf29b59d8cc653510d0ff4f675..a978af898f3c6e3bf4b7e394c88a72489c245a8c 100644
--- a/testSystemTools.h.in
+++ b/testSystemTools.h.in
@@ -14,7 +14,7 @@
 #ifndef @KWSYS_NAMESPACE@_testSystemtools_h
 #define @KWSYS_NAMESPACE@_testSystemtools_h
 
-#define TEST_DYNLOAD_LOCATION "@TEST_DYNLOAD_LOCATION@"
+#define EXECUTABLE_OUTPUT_PATH "@EXECUTABLE_OUTPUT_PATH@"
 
 #define TEST_SYSTEMTOOLS_BIN_FILE "@TEST_SYSTEMTOOLS_BIN_FILE@"
 #define TEST_SYSTEMTOOLS_SRC_FILE "@TEST_SYSTEMTOOLS_SRC_FILE@"