diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
index b7b15b4d..68bc770f 100644
--- a/.azure-pipelines/azure-pipelines.yml
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -251,7 +251,7 @@ stages:
           testFormat: devel/rhel/{0}
           targets:
             - test: '7.9'
-            - test: '8.5/pypi-latest'
+            - test: '8.5-pypi-latest'
           groups:
             - 1
             - 2
diff --git a/tests/utils/shippable/remote.sh b/tests/utils/shippable/remote.sh
index 55b4aa48..bdd8ad56 100755
--- a/tests/utils/shippable/remote.sh
+++ b/tests/utils/shippable/remote.sh
@@ -9,22 +9,20 @@ platform="${args[0]}"
 version="${args[1]}"
 target="shippable/posix/"
 
-force_python=""
-
-if [ "${#args[@]}" -gt 3 ]; then
-    if [ "${args[2]}" == "pypi-latest" ]; then
-        echo 'force_docker_sdk_for_python_pypi: true' >> tests/integration/interation_config.yml
-        if [ "${platform}" == "rhel" ] && [[ "${version}" =~ ^8\. ]]; then
-            # Use Python 3.8 on RHEL 8.x - TODO: this might be no longer necessary for high enough minor version! Check!
-            force_python="--python 3.8"
-        fi
-    else
-        echo "Invalid Docker SDK for Python version: '${args[2]}'"
-        exit 254
-    fi
-    target="shippable/posix/group${args[3]}/"
-elif [ "${#args[@]}" -gt 2 ]; then
+if [ "${#args[@]}" -gt 2 ]; then
     target="shippable/posix/group${args[2]}/"
+else
+    target="shippable/posix/"
+fi
+
+force_python=""
+if [[ "${version}" =~ -pypi-latest$ ]]; then
+    version="${version/-pypi-latest}"
+    echo 'force_docker_sdk_for_python_pypi: true' >> tests/integration/interation_config.yml
+    if [ "${platform}" == "rhel" ] && [[ "${version}" =~ ^8\. ]]; then
+        # Use Python 3.8 on RHEL 8.x - TODO: this might be no longer necessary for high enough minor version! Check!
+        force_python="--python 3.8"
+    fi
 fi
 
 stage="${S:-prod}"