diff --git a/test/utils/shippable/other.sh b/test/utils/shippable/other.sh
index 17c164d65e1..31ea17c2e91 100755
--- a/test/utils/shippable/other.sh
+++ b/test/utils/shippable/other.sh
@@ -3,14 +3,17 @@
 set -o pipefail
 
 add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports universe'
+add-apt-repository 'ppa:ubuntu-toolchain-r/test'
 add-apt-repository 'ppa:fkrull/deadsnakes'
-add-apt-repository 'ppa:jonathonf/python-3.6'
 
 apt-get update -qq
 apt-get install -qq \
     shellcheck \
     python2.4 \
-    python3.6 \
+    g++-4.9 \
+    python3.6-dev \
+
+ln -sf x86_64-linux-gnu-gcc-4.9 /usr/bin/x86_64-linux-gnu-gcc
 
 pip install tox --disable-pip-version-check
 
diff --git a/test/utils/shippable/units.sh b/test/utils/shippable/units.sh
index e78487d28e2..653a8f33c45 100755
--- a/test/utils/shippable/units.sh
+++ b/test/utils/shippable/units.sh
@@ -3,7 +3,7 @@
 set -o pipefail
 
 add-apt-repository 'ppa:ubuntu-toolchain-r/test'
-add-apt-repository 'ppa:jonathonf/python-3.6'
+add-apt-repository 'ppa:fkrull/deadsnakes'
 
 apt-get update -qq
 apt-get install -qq \