diff --git a/doc/contributions.txt b/doc/contributions.txt
index a4647f005dfdd2c291fd86ca90ff261628634201..54960b515bc453691e970a4623bd494f9aec04c0 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -560,6 +560,8 @@ TBBle Kurosawa
 	VWR-1892
 Teardrops Fall
 	VWR-5366
+Techwolf Lupindo
+	SNOW-654
 tenebrous pau
 	VWR-247
 Tharax Ferraris
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 1010b199a17fb8f4f83a973a6732ae39e6aca909..8052f7b473416b393c49ba8f3cd40054a0d50208 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -112,6 +112,8 @@ if (SERVER)
   endif (WINDOWS)
 endif (SERVER)
 
-# Define after the custom viewer and server targets are created so individual
-# apps can add themselves as dependencies
-add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
+if (LL_TESTS)
+  # Define after the custom viewer and server targets are created so individual
+  # apps can add themselves as dependencies
+  add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
+endif (LL_TESTS)