diff --git a/azure-pipelines-linux.yml b/azure-pipelines-linux.yml
index 817574a..0386a67 100644
--- a/azure-pipelines-linux.yml
+++ b/azure-pipelines-linux.yml
@@ -84,6 +84,9 @@ jobs:
       linux-amd64-clang-3.8:
         Folder: ci-linux-amd64-clang-3.8
         Tag: linux-amd64-clang-3.8
+      linux-amd64-clang-3.9:
+        Folder: ci-linux-amd64-clang-3.9
+        Tag: linux-amd64-clang-3.9
       linux-amd64-gcc-6:
         Folder: ci-linux-amd64-gcc-6
         Tag: linux-amd64-gcc-6
diff --git a/ci-linux-amd64-clang-3.9/Dockerfile b/ci-linux-amd64-clang-3.9/Dockerfile
new file mode 100644
index 0000000..337f96c
--- /dev/null
+++ b/ci-linux-amd64-clang-3.9/Dockerfile
@@ -0,0 +1,18 @@
+FROM openttd/base:linux-debian-stretch-amd64
+
+RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y && \
+    apt-get install -y --no-install-recommends \
+    clang-3.9=1:3.9* \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install openttd-opengfx, so we can easier run the regression tests
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    openttd-opengfx \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY files/run.sh /usr/bin/
+
+WORKDIR /workdir/source
+
+ENTRYPOINT ["run.sh"]
+CMD []
diff --git a/ci-linux-amd64-clang-3.9/files/run.sh b/ci-linux-amd64-clang-3.9/files/run.sh
new file mode 100755
index 0000000..4951bc3
--- /dev/null
+++ b/ci-linux-amd64-clang-3.9/files/run.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+echo ""
+echo "Validating source"
+echo "  OS: Linux"
+echo "  Compiler: clang 3.9"
+echo "  Arch: amd64"
+echo ""
+
+if [ -e "CMakeLists.txt" ]; then
+    mkdir build
+    cd build
+    cmake ..
+else
+    ./configure --prefix-dir=/usr
+fi
+
+make -j2 all test