diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index d6eec26cff388ddaf3452efc0921d173c93f3cc1..27397511b68849401aee6ac54233471ef52a9ae5 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -142,6 +142,9 @@ elseif(DARWIN)
         libnghttp2.dylib
         libnghttp2.14.dylib
         libnghttp2.14.19.0.dylib
+        liburiparser.dylib
+        liburiparser.1.dylib
+        liburiparser.1.0.27.dylib
        )
 
     if (USE_FMODSTUDIO)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 9677eddefbdb57f15256657ea169f604091f8e83..60bffa5f9aca997721d02b70272316006f61255b 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -102,6 +102,13 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
     # Setup target
     ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
     SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
+    if (DARWIN)
+      SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} 
+          PROPERTIES
+          BUILD_WITH_INSTALL_RPATH 1
+          INSTALL_RPATH "@executable_path/Resources"
+          )
+    endif(DARWIN)
 
     #
     # Per-codefile additional / external project dep and lib dep property extraction
@@ -230,6 +237,14 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
         )
   endif (WINDOWS)
 
+  if (DARWIN)
+    SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname}
+        PROPERTIES
+        BUILD_WITH_INSTALL_RPATH 1
+        INSTALL_RPATH "@executable_path/Resources"
+        )
+  endif(DARWIN)
+
   # Add link deps to the executable
   if(TEST_DEBUG)
     message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})")
diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake
index 828fa71665c14850af3985aaff1bc232e2af54d2..da9d389a60703125c740fa11b90d43fe6bb9be09 100644
--- a/indra/cmake/LLSharedLibs.cmake
+++ b/indra/cmake/LLSharedLibs.cmake
@@ -75,7 +75,7 @@ macro(ll_stage_sharedlib DSO_TARGET)
 
   if (DARWIN)
     set_target_properties(${DSO_TARGET} PROPERTIES
-      BUILD_WITH_INSTALL_RPATH 1
+      BUILD_WITH_INSTALL_NAME_DIR 1
       INSTALL_NAME_DIR "@executable_path/../Frameworks"
       )
   endif(DARWIN)
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 3cd17d916da4abd8b6f035d4b3825fa16b191c8a..a632055c38ac57c80d2e77fc18d7a7f83ccccdbf 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -96,7 +96,7 @@ if (DARWIN)
     media_plugin_cef
     PROPERTIES
     PREFIX ""
-    BUILD_WITH_INSTALL_RPATH 1
+    BUILD_WITH_INSTALL_NAME_DIR 1
     INSTALL_NAME_DIR "@executable_path"
     LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
   )
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt
index 89ac23122138fac31c6dd12d565e0b687a79f109..fb1ee65c44b8bf197dfa93eb8e609c0eac023ef7 100644
--- a/indra/media_plugins/example/CMakeLists.txt
+++ b/indra/media_plugins/example/CMakeLists.txt
@@ -65,7 +65,7 @@ if (DARWIN)
     media_plugin_example
     PROPERTIES
     PREFIX ""
-    BUILD_WITH_INSTALL_RPATH 1
+    BUILD_WITH_INSTALL_NAME_DIR 1
     INSTALL_NAME_DIR "@executable_path"
     LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
   )
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 3f67b6f65ae611398b4364954be2ecf250ba53f4..baa242f814f886c157da365e5aebebe2efe2c65a 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -66,7 +66,7 @@ if (DARWIN)
     media_plugin_libvlc
     PROPERTIES
     PREFIX ""
-    BUILD_WITH_INSTALL_RPATH 1
+    BUILD_WITH_INSTALL_NAME_DIR 1
     INSTALL_NAME_DIR "@executable_path"
     LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
   )