diff --git a/Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake b/Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
index 18c3340809..b3977f1bab 100644
--- a/Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
@@ -26,4 +26,12 @@ function(run_GEH)
   endforeach()
 endfunction()
 
+# remove these flags from the enviornment if they have been set
+# so the tests run the correct env
+set(env_cxx_flags $ENV{CXXFLAGS})
+if(env_cxx_flags)
+  string(REPLACE "-fvisibility=hidden" "" env_cxx_flags "${env_cxx_flags}")
+  string(REPLACE "-fvisibility-inlines-hidden" "" env_cxx_flags "${env_cxx_flags}")
+  set(ENV{CXXFLAGS} "${env_cxx_flags}")
+endif()
 run_GEH()
diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake
index bd0bbe3893..a681c7e9be 100644
--- a/Tests/RunCMake/install/RunCMakeTest.cmake
+++ b/Tests/RunCMake/install/RunCMakeTest.cmake
@@ -174,6 +174,13 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
   run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1)
   run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2)
 elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+  if(DEFINED ENV{LDFLAGS})
+    # Some setups prebake disable-new-dtags into LDFLAGS
+    set(new_ldflags $ENV{LDFLAGS}})
+    string(REPLACE "-Wl,--disable-new-dtags" "" new_ldflags "${new_ldflags}")
+    set(ENV{LDFLAGS} "${new_ldflags}")
+  endif()
+
   if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL")
     run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux)
   endif()