diff --git a/5.7.0/Dockerfile b/5.7.0/Dockerfile
new file mode 100644
index 0000000..a01e32a
--- /dev/null
+++ b/5.7.0/Dockerfile
@@ -0,0 +1,60 @@
+# PHPUnit Docker Container.
+FROM alpine:edge
+MAINTAINER Julien Breux <julien.breux@gmail.com>
+
+ENV PEAR_PACKAGES foo
+
+WORKDIR /tmp
+
+RUN apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing add \
+        bash \
+        ca-certificates \
+        git \
+        curl \
+        unzip \
+        php7 \
+        php7-xml \
+        php7-zip \
+        php7-xmlreader \
+        php7-zlib \
+        php7-opcache \
+        php7-mcrypt \
+        php7-openssl \
+        php7-curl \
+        php7-json \
+        php7-dom \
+        php7-phar \
+        php7-mbstring \
+        php7-bcmath \
+        php7-pdo \
+        php7-pdo_pgsql \
+        php7-pdo_sqlite \
+        php7-pdo_mysql \
+        php7-soap \
+        php7-xdebug \
+        php7-pcntl \
+        php7-ctype \
+        php7-session \
+    && ln -s /usr/bin/php7 /usr/bin/php \
+    && php -r "copy('https://pear.php.net/go-pear.phar', 'go-pear.phar');" \
+    && php go-pear.phar \
+    && php -r "unlink('go-pear.phar');" \
+    && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php composer-setup.php --install-dir=/usr/bin --filename=composer \
+    && php -r "unlink('composer-setup.php');" \
+    && composer require "phpunit/phpunit:~5.7.5" --prefer-source --no-interaction \
+    && composer require "phpunit/php-invoker" --prefer-source --no-interaction \
+    && ln -s /tmp/vendor/bin/phpunit /usr/local/bin/phpunit \
+    && sed -i 's/nn and/nn, Julien Breux (Docker) and/g' /tmp/vendor/phpunit/phpunit/src/Runner/Version.php \
+
+    # Enable X-Debug
+    && sed -i 's/\;z/z/g' /etc/php7/conf.d/xdebug.ini \
+    && php -m | grep -i xdebug
+
+ONBUILD RUN pear install $PEAR_PACKAGES
+
+VOLUME ["/app"]
+WORKDIR /app
+
+ENTRYPOINT ["/usr/local/bin/phpunit"]
+CMD ["--help"]
diff --git a/Makefile b/Makefile
index dcd7223..2a11c8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 build:
 	docker build --no-cache --rm -t julienbreux/phpunit master
 	docker build --no-cache --rm -t julienbreux/phpunit:5.7.5 5.7.5
+	docker build --no-cache --rm -t julienbreux/phpunit:5.7.0 5.7.0
 	docker build --no-cache --rm -t julienbreux/phpunit:5.5.0 5.5.0
 	docker build --no-cache --rm -t julienbreux/phpunit:5.4.7 5.4.7
 	docker build --no-cache --rm -t julienbreux/phpunit:5.4.6 5.4.6
@@ -38,6 +39,7 @@ build:
 version:
 	docker run -t --rm julienbreux/phpunit --version
 	docker run -t --rm julienbreux/phpunit:5.7.5 --version
+	docker run -t --rm julienbreux/phpunit:5.7.0 --version
 	docker run -t --rm julienbreux/phpunit:5.5.0 --version
 	docker run -t --rm julienbreux/phpunit:5.4.7 --version
 	docker run -t --rm julienbreux/phpunit:5.4.6 --version
diff --git a/README.md b/README.md
index f8873cc..d733fb7 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@
 * [PHPUnit](https://www.phpunit.de/)
   * Latest snapshot (master)
   * [`5.7.5`](https://github.com/sebastianbergmann/phpunit/blob/5.7/ChangeLog-5.7.md)
+  * [`5.7.0`](https://github.com/sebastianbergmann/phpunit/blob/5.7/ChangeLog-5.7.md)
   * [`5.5.0`](https://github.com/sebastianbergmann/phpunit/blob/5.5/ChangeLog-5.5.md)
   * [`5.4.7`](https://github.com/sebastianbergmann/phpunit/blob/5.4/ChangeLog-5.4.md)
   * [`5.4.6`](https://github.com/sebastianbergmann/phpunit/blob/5.4/ChangeLog-5.4.md)
diff --git a/settings.yml b/settings.yml
index 623e9c9..0db80eb 100644
--- a/settings.yml
+++ b/settings.yml
@@ -13,6 +13,7 @@ php:
   version: 7.0
 versions:
 - 5.7.5
+- 5.7.0
 - 5.5.0
 - 5.4.7
 - 5.4.6
diff --git a/templates/Dockerfile.liquid b/templates/Dockerfile.liquid
index 8cfc826..f5e6c14 100644
--- a/templates/Dockerfile.liquid
+++ b/templates/Dockerfile.liquid
@@ -13,7 +13,6 @@ RUN apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testin
         curl \
         unzip \
         php7 \
-        php7-ctype \
         php7-xml \
         php7-zip \
         php7-xmlreader \