diff --git a/tests/scout.sh b/tests/scout.sh
index ebe77cbe1c40f9b5a0a414a6e31df2c2c34a3b0d..57dbafca98efee1444c5d5bf4d1f48f693831220 100755
--- a/tests/scout.sh
+++ b/tests/scout.sh
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     )
 fi
 
-if [ -z "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
-    PRESSURE_VESSEL_DOWNLOAD_URL=https://repo.steampowered.com/pressure-vessel/snapshots/
-fi
-
 if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     populate_depot_args=( \
         "${populate_depot_args[@]}" \
@@ -41,21 +37,18 @@ else
     )
 fi
 
-if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
-    pressure_vessel_args=( \
-        --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
-    )
-elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
+pressure_vessel_args=()
+
+if [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
     pressure_vessel_args=( \
+        "${pressure_vessel_args[@]}" \
         --pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
         --pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
-        --pressure-vessel-version=latest \
     )
-else
+elif [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
     pressure_vessel_args=( \
+        "${pressure_vessel_args[@]}" \
         --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
     )
 fi
 
diff --git a/tests/sniper.sh b/tests/sniper.sh
index 9d6cf2277369181029c0f25ee3e2e917e19dcc8f..7e27d91b250a2cf1e7d0514a14cae931833c894f 100755
--- a/tests/sniper.sh
+++ b/tests/sniper.sh
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     )
 fi
 
-if [ -z "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
-    PRESSURE_VESSEL_DOWNLOAD_URL=https://repo.steampowered.com/pressure-vessel/snapshots/
-fi
-
 if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     populate_depot_args=( \
         "${populate_depot_args[@]}" \
@@ -47,21 +43,18 @@ else
     )
 fi
 
-if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
-    pressure_vessel_args=( \
-        --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
-    )
-elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
+pressure_vessel_args=()
+
+if [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
     pressure_vessel_args=( \
+        "${pressure_vessel_args[@]}" \
         --pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
         --pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
-        --pressure-vessel-version=latest \
     )
-else
+elif [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
     pressure_vessel_args=( \
+        "${pressure_vessel_args[@]}" \
         --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
     )
 fi
 
diff --git a/tests/soldier.sh b/tests/soldier.sh
index c37398ba19f6367dfbae08b13b596a21295abf53..7e6a25c34346d059affc2baea2ddc89edaa3c322 100755
--- a/tests/soldier.sh
+++ b/tests/soldier.sh
@@ -19,10 +19,6 @@ if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     )
 fi
 
-if [ -z "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
-    PRESSURE_VESSEL_DOWNLOAD_URL=https://repo.steampowered.com/pressure-vessel/snapshots/
-fi
-
 if [ -n "${IMAGES_DOWNLOAD_URL-}" ] && [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
     populate_depot_args=( \
         "${populate_depot_args[@]}" \
@@ -41,21 +37,18 @@ else
     )
 fi
 
-if [ -n "${IMAGES_DOWNLOAD_CREDENTIAL-}" ]; then
-    pressure_vessel_args=( \
-        --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
-    )
-elif [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
+pressure_vessel_args=()
+
+if [ -n "${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST-}"}" ] && [ -n "${PRESSURE_VESSEL_SSH_PATH-}" ]; then
     pressure_vessel_args=( \
+        "${pressure_vessel_args[@]}" \
         --pressure-vessel-ssh-host="${PRESSURE_VESSEL_SSH_HOST-"${IMAGES_SSH_HOST}"}" \
         --pressure-vessel-ssh-path="${PRESSURE_VESSEL_SSH_PATH}" \
-        --pressure-vessel-version=latest \
     )
-else
+elif [ -n "${PRESSURE_VESSEL_DOWNLOAD_URL-}" ]; then
     pressure_vessel_args=( \
+        "${pressure_vessel_args[@]}" \
         --pressure-vessel-uri="${PRESSURE_VESSEL_DOWNLOAD_URL}" \
-        --pressure-vessel-version=latest \
     )
 fi