diff --git a/.travis.yml b/.travis.yml
index abda7cde..6ed5a5d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,7 @@ matrix:
       before_install:
         - docker pull ubuntu:17.10
       script:
-        - export CC=gcc
-        - export CXX=g++
-        - docker build .
+        - docker build -f Dockerfile.gcc .
     - os: linux
       language: c
       sudo: required
@@ -19,9 +17,7 @@ matrix:
       before_install:
         - docker pull ubuntu:17.10
       script:
-        - export CC=clang
-        - export CXX=clang++
-        - docker build .
+        - docker build -f Dockerfile.clang .
     - os: osx
       osx_image: xcode7.3
       before_install:
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 9da612b0..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:17.10
-
-RUN apt-get update -qq
-RUN apt-get install -qq -y libtool intltool gcc clang automake autoconf cmake
-RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
-
-RUN mkdir -p /src/build/
-WORKDIR /src/build/
-
-RUN env
-
-COPY . /src/
-RUN cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
-RUN make
diff --git a/Dockerfile.clang b/Dockerfile.clang
new file mode 100644
index 00000000..69577858
--- /dev/null
+++ b/Dockerfile.clang
@@ -0,0 +1,12 @@
+FROM ubuntu:17.10
+
+RUN apt-get update -qq
+RUN apt-get install -qq -y libtool intltool clang automake autoconf cmake
+RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
+
+RUN mkdir -p /src/build/
+WORKDIR /src/build/
+
+COPY . /src/
+RUN cmake .. -DCMAKE_C_COMPILER='clang' -DCMAKE_CXX_COMPILER='clang++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
+RUN make
diff --git a/Dockerfile.gcc b/Dockerfile.gcc
new file mode 100644
index 00000000..0bdc886c
--- /dev/null
+++ b/Dockerfile.gcc
@@ -0,0 +1,12 @@
+FROM ubuntu:17.10
+
+RUN apt-get update -qq
+RUN apt-get install -qq -y libtool intltool gcc automake autoconf cmake
+RUN apt-get install -qq -y libavformat-dev libavcodec-dev libavutil-dev libgtk-3-dev libsdl2-dev libxtst-dev libxml2-utils libxml2-dev libarchive-dev libcdio-dev
+
+RUN mkdir -p /src/build/
+WORKDIR /src/build/
+
+COPY . /src/
+RUN cmake .. -DCMAKE_C_COMPILER='gcc' -DCMAKE_CXX_COMPILER='g++' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_LIBDIR='/usr/lib' -DSND_BACKEND='sdl' -DENABLE_CCDDA='ON' -DUSE_LIBARCHIVE='ON' -DUSE_LIBCDIO='ON'
+RUN make