diff --git a/run_tests.sh b/run_tests.sh
index f4419b6376c..8119950f727 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -3,8 +3,6 @@
 pwd_dir=$(pwd)
 cd `dirname $0`
 
-./scripts/common_startup.sh
-
 # A good place to look for nose info: http://somethingaboutorange.com/mrl/projects/nose/
 rm -f run_functional_tests.log
 
@@ -288,6 +286,12 @@ do
           watch=1
           shift
           ;;
+      --skip-common-startup)
+          # Don't run ./scripts/common_startup.sh (presumably it has already
+          # been done, or you know what you're doing).
+          skip_common_startup=1
+          shift
+          ;;
       --) 
           shift
           break
@@ -303,6 +307,10 @@ do
     esac
 done
 
+if [ -z "$skip_common_startup" ]; then
+    ./scripts/common_startup.sh
+fi
+
 if [ -n "$migrated_test" ] ; then
     [ -n "$test_id" ] && class=":TestForTool_$test_id" || class=""
     extra_args="functional.test_toolbox$class -migrated"
diff --git a/test/docker/base/run_test_wrapper.sh b/test/docker/base/run_test_wrapper.sh
index a3a4a3b5ceb..191a3c0c325 100644
--- a/test/docker/base/run_test_wrapper.sh
+++ b/test/docker/base/run_test_wrapper.sh
@@ -24,11 +24,13 @@ cd /galaxy
 GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION="$GALAXY_TEST_DBURI";
 export GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION
 
+[ ! -d .venv ] && ./scripts/common_startup.sh
+
 sh manage_db.sh upgrade
 
 if [ -z "$GALAXY_NO_TESTS" ];
 then
-    sh run_tests.sh $@
+    sh run_tests.sh --skip-common-startup $@
 else
     GALAXY_CONFIG_MASTER_API_KEY=${GALAXY_CONFIG_MASTER_API_KEY:-"testmasterapikey"}
     GALAXY_CONFIG_FILE=${GALAXY_CONFIG_FILE:-config/galaxy.ini.sample}