diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8c6bd5e0feaed7a18a1b158cab781025028f4867..1dd1ef369b38fda92d52ed5f8158d9727f787fbe 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -58,6 +58,7 @@ Aimee Trescothick
 Alejandro Rosenthal
 	VWR-1184
 Aleric Inglewood
+	SNOW-756
 	VWR-10001
 	VWR-10759
 	VWR-10837
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index e0c0ae2246859b24ec8d0e12a6526edc1c255972..d0f21a1e385a8acb77f297cddfa00c05334ed081 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -257,7 +257,11 @@ MACRO(SET_TEST_LIST LISTVAR)
     set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib)
   ELSE(WINDOWS)
     # Linux uses a single staging directory anyway.
-    set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
+	IF (STANDALONE)
+      set(${LISTVAR} ${CMAKE_BINARY_DIR}/llcommon /usr/lib /usr/local/lib)
+    ELSE (STANDALONE)
+	  set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
+    ENDIF (STANDALONE)
   ENDIF(WINDOWS)
 ENDMACRO(SET_TEST_LIST)