diff --git a/BuildParams b/BuildParams
index 0a4271f7a8..8e036ab56b 100644
--- a/BuildParams
+++ b/BuildParams
@@ -26,6 +26,7 @@ viewer-development.show_changes_since = last_sprint
 
 # Build Settings
 viewer-development_coverity.coverity_product = viewer
+viewer-development_coverity.run_tests = false
 viewer-development.build_debug_release_separately = true
 
 # Notifications - to configure email notices, add a setting like this:
diff --git a/build.sh b/build.sh
index cd1d9df6f3..1c28f5a255 100755
--- a/build.sh
+++ b/build.sh
@@ -66,7 +66,8 @@ pre_build()
     -DRELEASE_CRASH_REPORTING:BOOL=ON \
     -DLOCALIZESETUP:BOOL=ON \
     -DPACKAGE:BOOL=ON \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
+    -DLL_TESTS:BOOL="$run_tests"
   end_section "Pre$variant"
 }