diff --git a/.ci/setup.sh b/.ci/setup.sh
index a9d5eafd2..8de81da83 100755
--- a/.ci/setup.sh
+++ b/.ci/setup.sh
@@ -8,4 +8,10 @@
 set -e
 
 cidir=$(dirname "$0")
-bash "${cidir}/static-checks.sh"
+source "${cidir}/lib.sh"
+
+clone_tests_repo
+
+pushd "${tests_repo_dir}"
+.ci/setup.sh
+popd
diff --git a/.travis.yml b/.travis.yml
index 7548bfb12..6faf652d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@
 #
 
 sudo: required
-dist: trusty
+dist: xenial
 
 language: go
 os:
@@ -15,8 +15,11 @@ os:
 go:
   - "1.10.x"
 
-before_script:
+before_install:
   - ".ci/setup.sh"
 
+before_script:
+  - ".ci/static-checks.sh"
+
 script:
   - ".ci/run.sh"