diff --git a/doc/contributions.txt b/doc/contributions.txt
index 612041ecc521117c499d15e5f4113893d94d878a..e124a68df4b4d83df56de957b8be7c68897feb93 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -616,6 +616,7 @@ Teardrops Fall
 	VWR-5366
 Techwolf Lupindo
 	SNOW-92
+	SNOW-649
 	VWR-12385
 tenebrous pau
 	VWR-247
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 441becbae00c5683b4770750fa1805ccf5a71abc..fdd510b389404727c33285bdad45cb56285c8915 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -57,18 +57,21 @@ add_library (llplugin ${llplugin_SOURCE_FILES})
 
 add_subdirectory(slplugin)
 
-# Add tests
-include(LLAddBuildTest)
-# UNIT TESTS
-SET(llplugin_TEST_SOURCE_FILES
-  llplugincookiestore.cpp
-  )
+if (LL_TESTS)
+  # Add tests
+  include(LLAddBuildTest)
 
-# llplugincookiestore has a dependency on curl, so we need to link the curl library into the test.
-set_source_files_properties(
-  llplugincookiestore.cpp
-  PROPERTIES
-    LL_TEST_ADDITIONAL_LIBRARIES "${CURL_LIBRARIES}"
-  )
+  # UNIT TESTS
+  SET(llplugin_TEST_SOURCE_FILES
+      llplugincookiestore.cpp
+      )
 
-LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}")
+  # llplugincookiestore has a dependency on curl, so we need to link the curl library into the test.
+  set_source_files_properties(
+      llplugincookiestore.cpp
+      PROPERTIES
+      LL_TEST_ADDITIONAL_LIBRARIES "${CURL_LIBRARIES}"
+      )
+
+  LL_ADD_PROJECT_UNIT_TESTS(llplugin "${llplugin_TEST_SOURCE_FILES}")
+endif (LL_TESTS)