diff --git a/test/docker/base/Dockerfile b/test/docker/base/Dockerfile
index 264fdac38c9..611af155ced 100644
--- a/test/docker/base/Dockerfile
+++ b/test/docker/base/Dockerfile
@@ -85,13 +85,11 @@ RUN . $GALAXY_VIRTUAL_ENV/bin/activate && \
     echo "Prepopulating mysql database" && \
     GALAXY_CONFIG_DATABASE_CONNECTION="mysql://galaxy:galaxy@localhost/galaxy?unix_socket=/var/run/mysqld/mysqld.sock" bash create_db.sh && \
     echo "Prepopulating toolshed postgres database" && \
-    su -c '/usr/lib/postgresql/9.3/bin/pg_ctl -o "-F" start -D /opt/galaxy/db' postgres && \
-    GALAXY_CONFIG_DATABASE_CONNECTION="postgresql://root@localhost:5930/toolshed" bash create_db.sh tool_shed && \
+    TOOL_SHED_CONFIG_DATABASE_CONNECTION="postgresql://root@localhost:5930/toolshed" bash create_db.sh tool_shed && \
     echo "Prepopulating toolshed sqlite database" && \
-    GALAXY_CONFIG_DATABASE_CONNECTION="sqlite:////opt/galaxy/toolshed.sqlite" bash create_db.sh tool_shed && \
-    sh /opt/galaxy/start_mysql.sh && \
+    TOOL_SHED_CONFIG_DATABASE_CONNECTION="sqlite:////opt/galaxy/toolshed.sqlite" bash create_db.sh tool_shed && \
     echo "Prepopulating toolshed mysql database" && \
-    GALAXY_CONFIG_DATABASE_CONNECTION="mysql://galaxy:galaxy@localhost/toolshed?unix_socket=/var/run/mysqld/mysqld.sock" bash create_db.sh tool_shed
+    TOOL_SHED_CONFIG_DATABASE_CONNECTION="mysql://galaxy:galaxy@localhost/toolshed?unix_socket=/var/run/mysqld/mysqld.sock" bash create_db.sh tool_shed
 
 # bcftools for Galaxy.
 RUN mkdir -p /tmp/install && \
diff --git a/test/docker/base/run_test_wrapper.sh b/test/docker/base/run_test_wrapper.sh
index ad702b992a2..8943006145a 100644
--- a/test/docker/base/run_test_wrapper.sh
+++ b/test/docker/base/run_test_wrapper.sh
@@ -31,6 +31,8 @@ export GALAXY_TEST_INSTALL_DB_MERGED
 cd /galaxy
 GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION="$GALAXY_TEST_DBURI";
 export GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION
+TOOL_SHED_CONFIG_OVERRIDE_DATABASE_CONNECTION="$TOOL_SHED_TEST_DBURI";
+export TOOL_SHED_CONFIG_OVERRIDE_DATABASE_CONNECTION
 
 : ${GALAXY_VIRTUAL_ENV:=.venv}