diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7748e480..41fe25837 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,19 +1,25 @@
 version: 2
 jobs:
   build:
-    machine: true
+    machine:
+      image: ubuntu-1604:201903-01
     parallelism: 4
     steps:
       - checkout
+      - run: |
+          if [[ "$(lsb_release -rs)" == "14.04" ]]; then
+            # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
+            sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
+          else
+            # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to ens4
+            sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev ens4
+          fi
       - run: |
           make ci-dependencies
       - run: |
           ./tests/ci/setup.sh
       - run: |
           echo 'export DOKKU_SKIP_CLEANUP=true' | sudo tee /home/dokku/.dokkurc/dokku_skip_cleanup
-      - run: |
-          # dokku.me now resolves to 10.0.0.2. add 10.0.0.2/24 to eth0
-          sudo ip a a 10.0.0.2/24 broadcast 10.0.0.255 dev eth0
       - run: |
           case $CIRCLE_NODE_INDEX in
             0) sudo -E make -e lint go-tests ci-go-coverage ;;
diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh
index 77c61f0aa..190f2812e 100755
--- a/tests/ci/setup.sh
+++ b/tests/ci/setup.sh
@@ -27,7 +27,7 @@ install_dependencies() {
 
   sudo add-apt-repository -y ppa:nginx/stable
   sudo apt-get update
-  sudo apt-get -qq -y install nginx
+  sudo apt-get -qq -y install cgroupfs-mount nginx
   sudo cp "${ROOT_DIR}/tests/dhparam.pem" /etc/nginx/dhparam.pem
 
   sudo dpkg -i "${ROOT_DIR}/build/$HEROKUISH_PACKAGE_NAME"