diff --git a/shippable.yml b/shippable.yml
index 275d0099991..ae4acbcfeb2 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -18,6 +18,7 @@ matrix:
     - env: T=units/3.5
     - env: T=units/3.6
     - env: T=units/3.7
+    - env: T=units/3.8
 
     - env: T=windows/2008/1
     - env: T=windows/2008-R2/1
diff --git a/test/runner/completion/docker.txt b/test/runner/completion/docker.txt
index 9d2b457e632..5daea5a1438 100644
--- a/test/runner/completion/docker.txt
+++ b/test/runner/completion/docker.txt
@@ -1,4 +1,4 @@
-default name=quay.io/ansible/default-test-container:1.4.1 python=3
+default name=quay.io/ansible/default-test-container:1.5.1 python=3
 centos6 name=quay.io/ansible/centos6-test-container:1.4.0 seccomp=unconfined
 centos7 name=quay.io/ansible/centos7-test-container:1.4.0 seccomp=unconfined
 fedora28 name=quay.io/ansible/fedora28-test-container:1.5.0
diff --git a/test/runner/lib/executor.py b/test/runner/lib/executor.py
index f0310a8d223..5f595436040 100644
--- a/test/runner/lib/executor.py
+++ b/test/runner/lib/executor.py
@@ -118,6 +118,7 @@ SUPPORTED_PYTHON_VERSIONS = (
     '3.5',
     '3.6',
     '3.7',
+    '3.8',
 )
 
 HTTPTESTER_HOSTS = (
diff --git a/test/utils/shippable/windows.sh b/test/utils/shippable/windows.sh
index 45653cb505a..bd93cb4d68c 100755
--- a/test/utils/shippable/windows.sh
+++ b/test/utils/shippable/windows.sh
@@ -20,6 +20,7 @@ python_versions=(
     3.5
     3.6
     3.7
+    3.8
     2.7
 )