diff --git a/indra/cmake/DeploySharedLibs.cmake b/indra/cmake/DeploySharedLibs.cmake
index 36857b0a7f4417ff10ec59f80f3e41a117bcc763..41b7e6a5bb0d7e9eaf3ca3e09ef2b7f76eea8761 100644
--- a/indra/cmake/DeploySharedLibs.cmake
+++ b/indra/cmake/DeploySharedLibs.cmake
@@ -5,8 +5,7 @@
 # This  script requires a few cmake variable to be set on the command line:
 # BIN_NAME= The full path the the binary to search for dependecies.
 # SEARCH_DIRS= The full paths to dirs to search for dependencies.
-# DST_PATH= The full path where the dependecies will be copied. 
-
+# DST_PATH= The full path where the dependecies will be copied.
 get_filename_component(current_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
 include(GetPrerequisites)
 
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 6ef9af103abb89c54cb6cd9aa5a3e022712b9a12..97be1f81ddeaa1351fee96ff121c8ea46c2b6d41 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -88,5 +88,5 @@ if (DARWIN)
 endif (DARWIN)
 
 if (LL_TESTS)
-  ll_deploy_sharedlibs_command(AlchemyPlugin)
+  #ll_deploy_sharedlibs_command(AlchemyPlugin)
 endif (LL_TESTS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 02b08c887d9d2e865c95a886c749d0d9d49cd31e..872519af26ce6aa1aedadb74250f0c6605ffb1f5 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2382,13 +2382,6 @@ if (LL_TESTS)
   # if(USE_PRECOMPILED_HEADERS)
   #     set(test_sources "${test_sources}" llviewerprecompiledheaders.cpp)
   # endif(USE_PRECOMPILED_HEADERS)
-  set(test_libs
-    ${LLMESSAGE_LIBRARIES}
-    ${WINDOWS_LIBRARIES}
-    ${LLVFS_LIBRARIES}
-    ${LLMATH_LIBRARIES}
-    ${LLCOMMON_LIBRARIES}
-    )
 
   if (LINUX)
     # llcommon uses `clock_gettime' which is provided by librt on linux.
@@ -2401,9 +2394,11 @@ if (LL_TESTS)
     ${WINDOWS_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
-    ${LLCOMMON_LIBRARIES}
+    ${LLXML_LIBRARIES}
     ${LLMESSAGE_LIBRARIES}
+    ${LLLOGIN_LIBRARIES}
     ${LLCOREHTTP_LIBRARIES}
+    ${LLCOMMON_LIBRARIES}
     ${OPENSSL_LIBRARIES}
     ${CRYPTO_LIBRARIES}
     ${LIBRT_LIBRARY}
@@ -2432,8 +2427,13 @@ if (LL_TESTS)
     "${test_libs}"
     )
 
+  set(llviewernetwork_test_sources
+      llviewernetwork.cpp
+      lllogininstance.cpp
+  )
+	
   LL_ADD_INTEGRATION_TEST(llviewernetwork
-     llviewernetwork.cpp
+    "${llviewernetwork_test_sources}"
     "${test_libs}"
     )
 
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 5eda6204c10a52b90d100f0c6ad20970ecaf2069..f2b0fefc1b2bffa4c406a2a5bdba9a7200fd2f85 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -150,7 +150,7 @@ std::map<std::string, std::string> LLGridManager::getKnownGrids() const
 	return result;
 }
 
-void LLGridManager::setGridChoice(const std::string& grid_name)
+void LLGridManager::setGridChoice(const std::string&, const bool)
 {
 }
 
diff --git a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
index 2d8d621a5f8ba1620a152bebc2a8f52f19ffe103..1cb21d3d72c8d27233f2f2ea22ff18c186b8f149 100644
--- a/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
+++ b/indra/viewer_components/updater/tests/llupdaterservice_test.cpp
@@ -120,7 +120,7 @@ void LLUpdateDownloader::resume(void) {}
 void LLUpdateDownloader::cancel(void) {}
 void LLUpdateDownloader::setBandwidthLimit(U64 bytesPerSecond) {}
 
-int ll_install_update(std::string const &, std::string const &, bool, LLInstallScriptMode)
+int ll_install_update(std::string const &, std::string const &, std::string const &, std::string const &, bool, LLInstallScriptMode)
 {
 	return 0;
 }
diff --git a/indra/win_crash_logger/CMakeLists.txt b/indra/win_crash_logger/CMakeLists.txt
index 68c55129248d6820f7afe7accbc8604f4b6e54a3..2b72642a2c1e133fd7fa29afa86a19eeb8eaec03 100644
--- a/indra/win_crash_logger/CMakeLists.txt
+++ b/indra/win_crash_logger/CMakeLists.txt
@@ -103,5 +103,5 @@ if (WINDOWS)
 endif (WINDOWS)
 
 if (LL_TESTS)
-  ll_deploy_sharedlibs_command(windows-crash-logger)
+  #ll_deploy_sharedlibs_command(windows-crash-logger)
 endif (LL_TESTS)