diff --git a/tools/test/test.sh b/tools/test/test.sh
index f14b80bf27..95d9bae2c4 100755
--- a/tools/test/test.sh
+++ b/tools/test/test.sh
@@ -20,53 +20,46 @@ echo "* Using $(command -v python) $(python --version 2>&1) and $(command -v pip
 
 SOURCE_PATH=/usr/local/src/rucio
 CFG_PATH=/usr/local/src/rucio/etc/docker/test/extra/
-RUCIO_HOME=/opt/rucio
+if [ -z "$RUCIO_HOME" ]; then
+    RUCIO_HOME=/opt/rucio
+fi
 
-# Prepare the test configurations
-if [ "$SUITE" == "client" ] || [ "$SUITE" == "client_syntax" ]; then
+function srchome() {
+    export RUCIO_HOME="$SOURCE_PATH"
     cd $SOURCE_PATH
-    cp etc/docker/test/extra/rucio_client.cfg etc/rucio.cfg
-
-elif [ "$SUITE" == "votest" ]; then
-    VOTEST_HELPER=$RUCIO_HOME/tools/test/votest_helper.py
-    VOTEST_CONFIG_FILE=$RUCIO_HOME/etc/docker/test/matrix_policy_package_tests.yml
-    echo "VOTEST: Overriding policy section in rucio.cfg"
-    python $VOTEST_HELPER --vo $POLICY --vo-config --file $VOTEST_CONFIG_FILE
-    echo "VOTEST: Restarting httpd to load config"
-    httpd -k restart
-
-elif [ "$SUITE" == "remote_dbs" ] || [ "$SUITE" == "multi_vo" ]; then
-
-    if [ "$SUITE" == "multi_vo" ]; then
-        mkdir -p $RUCIO_HOME/etc/multi_vo/tst/etc
-        mkdir -p $RUCIO_HOME/etc/multi_vo/ts2/etc
-        python3 $SOURCE_PATH/tools/merge_rucio_configs.py --use-env \
-            -s "$CFG_PATH"/rucio_autotests_common.cfg "$CFG_PATH"/rucio_multi_vo_tst_postgres14.cfg \
-            -d $RUCIO_HOME/etc/multi_vo/tst/etc/rucio.cfg
-        python3 $SOURCE_PATH/tools/merge_rucio_configs.py --use-env \
-            -s "$CFG_PATH"/rucio_autotests_common.cfg "$CFG_PATH"/rucio_multi_vo_ts2_postgres14.cfg \
-            -d $RUCIO_HOME/etc/multi_vo/ts2/etc/rucio.cfg
-    fi
+}
 
+function wait_for_database() {
     echo 'Waiting for database to be ready'
     if ! python3 -c "from rucio.db.sqla.session import wait_for_database; wait_for_database()"
     then
         echo 'Cannot access database'
         exit 1
     fi
+}
 
-    httpd -k restart
-
-fi
+if [ "$SUITE" == "client" ] || [ "$SUITE" == "client_syntax" ]; then
+    cd $SOURCE_PATH
+    cp etc/docker/test/extra/rucio_client.cfg etc/rucio.cfg
 
-# Run tests
+    if [ "$SUITE" == "client" ]; then
+        tools/run_tests.sh -i
+    fi
 
-function srchome() {
-    export RUCIO_HOME=$SOURCE_PATH
-    cd $SOURCE_PATH
-}
+    srchome
+    if [ "$SUITE" == "client" ]; then
+        tools/pytest.sh -v --tb=short tests/test_clients.py tests/test_bin_rucio.py tests/test_module_import.py
+    elif [ "$SUITE" == "client_syntax" ]; then
+        CLIENT_BIN_FILES="bin/rucio bin/rucio-admin"
+        SYNTAX_PYLINT_ARGS="$(tools/test/ignoretool.py --pylint)"
+        SYNTAX_FLAKE_ARGS="$(tools/test/ignoretool.py --flake8) $CLIENT_BIN_FILES tests/test_clients.py tests/test_bin_rucio.py tests/test_module_import.py"
+        export SYNTAX_PYLINT_ARGS
+        export SYNTAX_PYLINT_BIN_ARGS="$CLIENT_BIN_FILES"
+        export SYNTAX_FLAKE_ARGS
+        tools/test/check_syntax.sh
+    fi
 
-if [ "$SUITE" == "syntax" ]; then
+elif [ "$SUITE" == "syntax" ]; then
     srchome
     tools/test/check_syntax.sh
 
@@ -82,37 +75,42 @@ elif [ "$SUITE" == "docs" ]; then
     tools/generate_rest_api_doc.py > $REST_API_DOC_FILENAME
     tools/test/check_rest_api_documentation.sh $REST_API_DOC_FILENAME
 
+elif [ "$SUITE" == "votest" ]; then
+    VOTEST_HELPER=$RUCIO_HOME/tools/test/votest_helper.py
+    VOTEST_CONFIG_FILE=$RUCIO_HOME/etc/docker/test/matrix_policy_package_tests.yml
+    echo "VOTEST: Overriding policy section in rucio.cfg"
+    python $VOTEST_HELPER --vo "$POLICY" --vo-config --file $VOTEST_CONFIG_FILE
+    echo "VOTEST: Restarting httpd to load config"
+    httpd -k restart
 
-elif [[ "$SUITE" =~ ^client.* ]]; then
-    if [ "$SUITE" == "client" ]; then
-        tools/run_tests.sh -i
-    fi
+    TESTS=$(python $VOTEST_HELPER --vo "$POLICY" --tests --file $VOTEST_CONFIG_FILE)
+    export TESTS
+    tools/run_tests.sh -p
 
-    srchome
-    if [ "$SUITE" == "client" ]; then
-        tools/pytest.sh -v --tb=short tests/test_clients.py tests/test_bin_rucio.py tests/test_module_import.py
-    elif [ "$SUITE" == "client_syntax" ]; then
-        CLIENT_BIN_FILES="bin/rucio bin/rucio-admin"
-        export SYNTAX_PYLINT_ARGS="$(tools/test/ignoretool.py --pylint)"
-        export SYNTAX_PYLINT_BIN_ARGS="$CLIENT_BIN_FILES"
-        export SYNTAX_FLAKE_ARGS="$(tools/test/ignoretool.py --flake8) $CLIENT_BIN_FILES tests/test_clients.py tests/test_bin_rucio.py tests/test_module_import.py"
-        tools/test/check_syntax.sh
-    fi
+elif [ "$SUITE" == "multi_vo" ]; then
+    VO1_HOME="$RUCIO_HOME"
+    mkdir -p "$VO1_HOME/etc"
+    python3 $SOURCE_PATH/tools/merge_rucio_configs.py --use-env \
+        -s "$CFG_PATH"/rucio_autotests_common.cfg "$CFG_PATH"/rucio_multi_vo_tst_postgres14.cfg \
+        -d "$VO1_HOME"/etc/rucio.cfg
+    httpd -k restart
+
+    VO2_HOME="$RUCIO_HOME/../ts2"
+    mkdir -p "$VO2_HOME/etc"
+    python3 $SOURCE_PATH/tools/merge_rucio_configs.py --use-env \
+        -s "$CFG_PATH"/rucio_autotests_common.cfg "$CFG_PATH"/rucio_multi_vo_ts2_postgres14.cfg \
+        -d "$VO2_HOME"/etc/rucio.cfg
+
+    wait_for_database
+
+    tools/run_multi_vo_tests_docker.sh
+
+elif [ "$SUITE" == "remote_dbs" ] || [ "$SUITE" == "sqlite" ]; then
+    wait_for_database
 
-elif [ "$SUITE" == "remote_dbs" ] || [ "$SUITE" == "sqlite" ] || [ "$SUITE" == "py37py38" ]; then
     if [ -n "$TESTS" ]; then
         tools/run_tests.sh -p
     else
         tools/run_tests.sh
     fi
-
-elif [ "$SUITE" == "multi_vo" ]; then
-    tools/run_multi_vo_tests_docker.sh
-
-elif [ "$SUITE" == "votest" ]; then
-    RUCIO_HOME=/opt/rucio
-    VOTEST_HELPER=$RUCIO_HOME/tools/test/votest_helper.py
-    VOTEST_CONFIG_FILE=$RUCIO_HOME/etc/docker/test/matrix_policy_package_tests.yml
-    export TESTS=$(python $VOTEST_HELPER --vo $POLICY --tests --file $VOTEST_CONFIG_FILE)
-    tools/run_tests.sh -p
 fi