diff --git a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake
index 188135bd77..a30667b5d6 100644
--- a/Modules/Platform/GNU.cmake
+++ b/Modules/Platform/GNU.cmake
@@ -4,6 +4,7 @@ set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
 set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
 set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
 set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
+set(CMAKE_SHARED_LIBRARY_RPATH_ORIGIN_TOKEN "\$ORIGIN")
 set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
 set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
diff --git a/Tests/RunCMake/RuntimePath/RunCMakeTest.cmake b/Tests/RunCMake/RuntimePath/RunCMakeTest.cmake
index 180a0feaa5..ba064417e3 100644
--- a/Tests/RunCMake/RuntimePath/RunCMakeTest.cmake
+++ b/Tests/RunCMake/RuntimePath/RunCMakeTest.cmake
@@ -45,7 +45,7 @@ block()
   run_cmake(Stub)
   set(RunCMake_TEST_NO_CLEAN 1)
   run_cmake_command(Stub-build ${CMAKE_COMMAND} --build . --config Debug)
-  if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|SunOS)$|BSD")
+  if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|SunOS|GNU)$|BSD")
     set(ldpath LD_LIBRARY_PATH)
   elseif(CMAKE_SYSTEM_NAME MATCHES "^(Darwin)$")
     set(ldpath DYLD_LIBRARY_PATH)