diff --git a/images/python36/Dockerfile b/images/python36/Dockerfile
new file mode 100644
index 0000000..04c1b4f
--- /dev/null
+++ b/images/python36/Dockerfile
@@ -0,0 +1,20 @@
+FROM markadams/chromium-xvfb
+
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && \
+    apt-get install -y \
+    python3.6 python3-pip curl unzip libgconf-2-4
+
+RUN pip3 install pytest selenium
+
+ENV CHROMEDRIVER_VERSION 2.36
+ENV CHROMEDRIVER_SHA256 2461384f541346bb882c997886f8976edc5a2e7559247c8642f599acd74c21d4
+
+RUN curl -SLO "https://chromedriver.storage.googleapis.com/$CHROMEDRIVER_VERSION/chromedriver_linux64.zip" \
+  && echo "$CHROMEDRIVER_SHA256  chromedriver_linux64.zip" | sha256sum -c - \
+  && unzip "chromedriver_linux64.zip" -d /usr/local/bin \
+  && rm "chromedriver_linux64.zip"
+
+WORKDIR /usr/src/app
+
+CMD py.test