diff --git a/.travis.yml b/.travis.yml
index c749f7fc..666fea63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
 sudo: required
 
 env:
-  - IMAGE=ubuntu:artful
-  - IMAGE=ubuntu:bionic
+  - IMAGE=ubuntu-daily:bionic SCRIPT="make lint"
+  - IMAGE=ubuntu-daily:artful SCRIPT=./scripts/runtests.sh
+  - IMAGE=ubuntu-daily:bionic SCRIPT=./scripts/runtests.sh
+  - IMAGE=ubuntu-daily:cosmic SCRIPT=./scripts/runtests.sh
 
 language: bash
 
 script:
-  - sudo ./scripts/test-in-lxd.sh $IMAGE
+  - sudo ./scripts/test-in-lxd.sh "$IMAGE" "$SCRIPT"
diff --git a/Makefile b/Makefile
index 00f19107..593ea559 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ install_deps:
 	sudo apt-get install -y python3-urwid python3-pyudev python3-nose python3-flake8 \
 		python3-yaml python3-coverage python3-dev pkg-config libnl-genl-3-dev \
 		libnl-route-3-dev python3-attr python3-distutils-extra python3-requests \
-		python3-requests-unixsocket
+		python3-requests-unixsocket pep8
 
 i18n:
 	python3 setup.py build
diff --git a/scripts/installdeps.sh b/scripts/installdeps.sh
new file mode 100755
index 00000000..0382a9b9
--- /dev/null
+++ b/scripts/installdeps.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eux
+apt-get update
+apt-get -y dist-upgrade
+apt-get install -y --no-install-recommends libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libsystemd-dev python3-distutils-extra pkg-config python3.5 python3-pip git lsb-release python3-setuptools gcc python3-dev python3-wheel curtin pep8 python3-pyflakes
+pip3 install -r requirements.txt
+python3 setup.py build
diff --git a/scripts/runtests.sh b/scripts/runtests.sh
index b61ebf83..fa00053b 100755
--- a/scripts/runtests.sh
+++ b/scripts/runtests.sh
@@ -1,11 +1,4 @@
 #!/bin/bash
-set -eux
-apt-get update
-apt-get -y dist-upgrade
-apt-get install -y --no-install-recommends libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libsystemd-dev python3-distutils-extra pkg-config python3.5 python3-pip git lsb-release python3-setuptools gcc python3-dev python3-wheel curtin
-pip3 install -r requirements.txt
-python3 setup.py build
-
 python3 -m unittest discover
 # The --foreground is important to avoid subiquity getting SIGTTOU-ed.
 timeout --foreground 60 sh -c 'LANG=C.UTF-8 PYTHONPATH=. python3 bin/subiquity-tui --answers examples/answers.yaml --dry-run --machine-config examples/mwhudson.json'
diff --git a/scripts/test-in-lxd.sh b/scripts/test-in-lxd.sh
index 635971e0..97ffb603 100755
--- a/scripts/test-in-lxd.sh
+++ b/scripts/test-in-lxd.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -eux
 IMAGE=$1
+SCRIPT=$2
 
 apt-get -qq update
 apt -t trusty-backports install -y lxd
@@ -42,4 +43,4 @@ then
     done
 fi
 
-lxc exec tester -- sh -c "cd /subiquity && ./scripts/runtests.sh"
+lxc exec tester -- sh -c "cd /subiquity && ./scripts/installdeps.sh && $SCRIPT"