diff --git a/.travis.yml b/.travis.yml
index 402c9538eb..19e2664fc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,11 @@ matrix:
   include:
     - os: linux
       env: NAME="clang-format"
+      sudo: required
       dist: trusty
-      addons:
-        apt:
-          sources:
-            - llvm-toolchain-trusty-6.0
-            - ubuntu-toolchain-r-test
-          packages:
-            - clang-format-6.0
-      script: "./.travis/clang-format/script.sh"
+      services: docker
+      install: "./.travis/clang-format/deps.sh"
+      script: "./.travis/clang-format/build.sh"
     - os: linux
       env: NAME="linux build"
       sudo: required
diff --git a/.travis/clang-format/build.sh b/.travis/clang-format/build.sh
new file mode 100755
index 0000000000..2ab6c2f0ac
--- /dev/null
+++ b/.travis/clang-format/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash -ex
+mkdir -p "$HOME/.ccache"
+docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-clang-format /bin/bash -ex /citra/.travis/clang-format/docker.sh
diff --git a/.travis/clang-format/deps.sh b/.travis/clang-format/deps.sh
new file mode 100755
index 0000000000..a15d164c7b
--- /dev/null
+++ b/.travis/clang-format/deps.sh
@@ -0,0 +1,3 @@
+#!/bin/sh -ex
+
+docker pull citraemu/build-environments:linux-clang-format
diff --git a/.travis/clang-format/docker.sh b/.travis/clang-format/docker.sh
new file mode 100755
index 0000000000..6f3eab3637
--- /dev/null
+++ b/.travis/clang-format/docker.sh
@@ -0,0 +1,5 @@
+#!/bin/bash -ex
+
+# Run clang-format
+cd /citra
+./.travis/clang-format/script.sh
diff --git a/.travis/common/travis-ci.env b/.travis/common/travis-ci.env
index 5fa27a706b..a2c6dbefdf 100644
--- a/.travis/common/travis-ci.env
+++ b/.travis/common/travis-ci.env
@@ -6,6 +6,8 @@ TRAVIS_BRANCH
 TRAVIS_BUILD_ID
 TRAVIS_BUILD_NUMBER
 TRAVIS_COMMIT
+TRAVIS_COMMIT_RANGE
+TRAVIS_EVENT_TYPE
 TRAVIS_JOB_ID
 TRAVIS_JOB_NUMBER
 TRAVIS_REPO_SLUG