diff --git a/shippable.yml b/shippable.yml
index 6c60b8b427..1b19da502b 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -8,102 +8,102 @@ matrix:
   exclude:
     - env: T=none
   include:
-    - env: T=sanity/1
-    - env: T=sanity/2
-    - env: T=sanity/3
-    - env: T=sanity/4
-    - env: T=sanity/extra
+    - env: T=devel/sanity/1
+    - env: T=devel/sanity/2
+    - env: T=devel/sanity/3
+    - env: T=devel/sanity/4
+    - env: T=devel/sanity/extra
 
-    - env: T=units/2.6/1
-    - env: T=units/2.7/1
-    - env: T=units/3.5/1
-    - env: T=units/3.6/1
-    - env: T=units/3.7/1
-    - env: T=units/3.8/1
-    - env: T=units/3.9/1
+    - env: T=devel/units/2.6/1
+    - env: T=devel/units/2.7/1
+    - env: T=devel/units/3.5/1
+    - env: T=devel/units/3.6/1
+    - env: T=devel/units/3.7/1
+    - env: T=devel/units/3.8/1
+    - env: T=devel/units/3.9/1
 
-    #- env: T=aix/7.2/1
-    - env: T=osx/10.11/1
-    - env: T=rhel/7.8/1
-    - env: T=rhel/8.2/1
-    - env: T=freebsd/11.1/1
-    - env: T=freebsd/12.1/1
-    - env: T=linux/centos6/1
-    - env: T=linux/centos7/1
-    - env: T=linux/centos8/1
-    - env: T=linux/fedora31/1
-    - env: T=linux/fedora32/1
-    - env: T=linux/opensuse15py2/1
-    - env: T=linux/opensuse15/1
-    - env: T=linux/ubuntu1604/1
-    - env: T=linux/ubuntu1804/1
+    #- env: T=devel/aix/7.2/1
+    - env: T=devel/osx/10.11/1
+    - env: T=devel/rhel/7.8/1
+    - env: T=devel/rhel/8.2/1
+    - env: T=devel/freebsd/11.1/1
+    - env: T=devel/freebsd/12.1/1
+    - env: T=devel/linux/centos6/1
+    - env: T=devel/linux/centos7/1
+    - env: T=devel/linux/centos8/1
+    - env: T=devel/linux/fedora31/1
+    - env: T=devel/linux/fedora32/1
+    - env: T=devel/linux/opensuse15py2/1
+    - env: T=devel/linux/opensuse15/1
+    - env: T=devel/linux/ubuntu1604/1
+    - env: T=devel/linux/ubuntu1804/1
 
-    #- env: T=aix/7.2/2
-    - env: T=osx/10.11/2
-    - env: T=rhel/7.8/2
-    - env: T=rhel/8.2/2
-    - env: T=freebsd/11.1/2
-    - env: T=freebsd/12.1/2
-    - env: T=linux/centos6/2
-    - env: T=linux/centos7/2
-    - env: T=linux/centos8/2
-    - env: T=linux/fedora31/2
-    - env: T=linux/fedora32/2
-    - env: T=linux/opensuse15py2/2
-    - env: T=linux/opensuse15/2
-    - env: T=linux/ubuntu1604/2
-    - env: T=linux/ubuntu1804/2
+    #- env: T=devel/aix/7.2/2
+    - env: T=devel/osx/10.11/2
+    - env: T=devel/rhel/7.8/2
+    - env: T=devel/rhel/8.2/2
+    - env: T=devel/freebsd/11.1/2
+    - env: T=devel/freebsd/12.1/2
+    - env: T=devel/linux/centos6/2
+    - env: T=devel/linux/centos7/2
+    - env: T=devel/linux/centos8/2
+    - env: T=devel/linux/fedora31/2
+    - env: T=devel/linux/fedora32/2
+    - env: T=devel/linux/opensuse15py2/2
+    - env: T=devel/linux/opensuse15/2
+    - env: T=devel/linux/ubuntu1604/2
+    - env: T=devel/linux/ubuntu1804/2
 
-    #- env: T=aix/7.2/3
-    - env: T=osx/10.11/3
-    - env: T=rhel/7.8/3
-    - env: T=rhel/8.2/3
-    - env: T=freebsd/11.1/3
-    - env: T=freebsd/12.1/3
-    - env: T=linux/centos6/3
-    - env: T=linux/centos7/3
-    - env: T=linux/centos8/3
-    - env: T=linux/fedora31/3
-    - env: T=linux/fedora32/3
-    - env: T=linux/opensuse15py2/3
-    - env: T=linux/opensuse15/3
-    - env: T=linux/ubuntu1604/3
-    - env: T=linux/ubuntu1804/3
+    #- env: T=devel/aix/7.2/3
+    - env: T=devel/osx/10.11/3
+    - env: T=devel/rhel/7.8/3
+    - env: T=devel/rhel/8.2/3
+    - env: T=devel/freebsd/11.1/3
+    - env: T=devel/freebsd/12.1/3
+    - env: T=devel/linux/centos6/3
+    - env: T=devel/linux/centos7/3
+    - env: T=devel/linux/centos8/3
+    - env: T=devel/linux/fedora31/3
+    - env: T=devel/linux/fedora32/3
+    - env: T=devel/linux/opensuse15py2/3
+    - env: T=devel/linux/opensuse15/3
+    - env: T=devel/linux/ubuntu1604/3
+    - env: T=devel/linux/ubuntu1804/3
 
-    #- env: T=aix/7.2/4
-    - env: T=osx/10.11/4
-    - env: T=rhel/7.8/4
-    - env: T=rhel/8.2/4
-    - env: T=freebsd/11.1/4
-    - env: T=freebsd/12.1/4
-    - env: T=linux/centos6/4
-    - env: T=linux/centos7/4
-    - env: T=linux/centos8/4
-    - env: T=linux/fedora31/4
-    - env: T=linux/fedora32/4
-    - env: T=linux/opensuse15py2/4
-    - env: T=linux/opensuse15/4
-    - env: T=linux/ubuntu1604/4
-    - env: T=linux/ubuntu1804/4
+    #- env: T=devel/aix/7.2/4
+    - env: T=devel/osx/10.11/4
+    - env: T=devel/rhel/7.8/4
+    - env: T=devel/rhel/8.2/4
+    - env: T=devel/freebsd/11.1/4
+    - env: T=devel/freebsd/12.1/4
+    - env: T=devel/linux/centos6/4
+    - env: T=devel/linux/centos7/4
+    - env: T=devel/linux/centos8/4
+    - env: T=devel/linux/fedora31/4
+    - env: T=devel/linux/fedora32/4
+    - env: T=devel/linux/opensuse15py2/4
+    - env: T=devel/linux/opensuse15/4
+    - env: T=devel/linux/ubuntu1604/4
+    - env: T=devel/linux/ubuntu1804/4
 
-    #- env: T=aix/7.2/5
-    - env: T=osx/10.11/5
-    - env: T=rhel/7.8/5
-    - env: T=rhel/8.2/5
-    - env: T=freebsd/11.1/5
-    - env: T=freebsd/12.1/5
-    - env: T=linux/centos6/5
-    - env: T=linux/centos7/5
-    - env: T=linux/centos8/5
-    - env: T=linux/fedora31/5
-    - env: T=linux/fedora32/5
-    - env: T=linux/opensuse15py2/5
-    - env: T=linux/opensuse15/5
-    - env: T=linux/ubuntu1604/5
-    - env: T=linux/ubuntu1804/5
+    #- env: T=devel/aix/7.2/5
+    - env: T=devel/osx/10.11/5
+    - env: T=devel/rhel/7.8/5
+    - env: T=devel/rhel/8.2/5
+    - env: T=devel/freebsd/11.1/5
+    - env: T=devel/freebsd/12.1/5
+    - env: T=devel/linux/centos6/5
+    - env: T=devel/linux/centos7/5
+    - env: T=devel/linux/centos8/5
+    - env: T=devel/linux/fedora31/5
+    - env: T=devel/linux/fedora32/5
+    - env: T=devel/linux/opensuse15py2/5
+    - env: T=devel/linux/opensuse15/5
+    - env: T=devel/linux/ubuntu1604/5
+    - env: T=devel/linux/ubuntu1804/5
 
-    - env: T=cloud/2.7/1
-    - env: T=cloud/3.6/1
+    - env: T=devel/cloud/2.7/1
+    - env: T=devel/cloud/3.6/1
 
 branches:
   except:
diff --git a/tests/utils/shippable/shippable.sh b/tests/utils/shippable/shippable.sh
index 6cb46d624e..6bcc1300d7 100755
--- a/tests/utils/shippable/shippable.sh
+++ b/tests/utils/shippable/shippable.sh
@@ -5,9 +5,16 @@ set -o pipefail -eux
 declare -a args
 IFS='/:' read -ra args <<< "$1"
 
-script="${args[0]}"
+ansible_version="${args[0]}"
+script="${args[1]}"
 
-test="$1"
+function join {
+    local IFS="$1";
+    shift;
+    echo "$*";
+}
+
+test="$(join / "${args[@]:1}")"
 
 docker images ansible/ansible
 docker images quay.io/ansible/*
@@ -46,7 +53,11 @@ function retry
 command -v pip
 pip --version
 pip list --disable-pip-version-check
-retry pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
+if [ "${ansible_version}" == "devel" ]; then
+    retry pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
+else
+    retry pip install "https://github.com/ansible/ansible/archive/stable-${ansible_version}.tar.gz" --disable-pip-version-check
+fi
 
 export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
 SHIPPABLE_RESULT_DIR="$(pwd)/shippable"