diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 95317f61dc..29bf55ba14 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -69,8 +69,10 @@ if (VIEWER)
   add_subdirectory(${LIBS_OPEN_PREFIX}llxuixml)
   add_subdirectory(${LIBS_OPEN_PREFIX}viewer_components)
 
-  # Legacy C++ tests. Build always, run if LL_TESTS is true.
-  add_subdirectory(${VIEWER_PREFIX}test)
+  if (LL_TESTS OR NOT STANDALONE)
+    # Legacy C++ tests. Build always, run if LL_TESTS is true.
+    add_subdirectory(${VIEWER_PREFIX}test)
+  endif (LL_TESTS OR NOT STANDALONE)
 
   # viewer media plugins
   add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)