diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index c11fa0920620f36f340a39a7bfb9beac99c9112b..9bb3077797db94c929b803c68a4f977a51c354d1 100755
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -50,7 +50,6 @@ INCLUDE(GoogleMock)
     )
   SET(alltest_LIBRARIES
     ${GOOGLEMOCK_LIBRARIES}
-    ${BOOST_SYSTEM_LIBRARY}
     ${PTHREAD_LIBRARY}
     ${WINDOWS_LIBRARIES}
     )
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index bc2ef4f2c5b733cff0a7fccf2523188bfb5f0abe..62d4af17376f3fce9897db656e5c3c48816f397e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2082,6 +2082,12 @@ if (LL_TESTS)
     LL_TEST_ADDITIONAL_LIBRARIES "${JSONCPP_LIBRARIES}"
   )
 
+  set_source_files_properties(
+    lllogininstance.cpp
+    PROPERTIES
+    LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
+  )
+
   LL_ADD_PROJECT_UNIT_TESTS(${VIEWER_BINARY_NAME} "${viewer_TEST_SOURCE_FILES}")
 
   #set(TEST_DEBUG on)