diff --git a/.travis.yml b/.travis.yml
index 71a4a138..17d9825a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 notifications:
   irc: chat.freenote.net#pil
-dist: trusty
+dist: xenial
 services:
 - docker
 matrix:
@@ -15,8 +15,8 @@ matrix:
     - env: DOCKER="centos-7-amd64"
     - env: DOCKER="fedora-28-amd64"
     - env: DOCKER="fedora-29-amd64"
-    - env: DOCKER="ubuntu-trusty-x86"
-    - env: DOCKER="ubuntu-xenial-amd64"
+    - env: DOCKER="ubuntu-16.04-xenial-amd64"
+    - env: DOCKER="ubuntu-18.04-bionic-amd64"
     - env: DOCKER="debian-stretch-x86"
 install:
 - sudo apt-get update && sudo apt-get install -qyy debootstrap
diff --git a/Makefile b/Makefile
index ca6719fd..b78d56ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-trusty-x86 ubuntu-xenial-amd64 debian-stretch-x86 fedora-28-amd64 fedora-29-amd64 centos-6-amd64 centos-7-amd64
+TARGETS = alpine arch amazon-1-amd64 amazon-2-amd64 ubuntu-16.04-xenial-amd64 ubuntu-18.04-bionic-amd64 debian-stretch-x86 fedora-28-amd64 fedora-29-amd64 centos-6-amd64 centos-7-amd64
 
 
 BUILDDIRS = $(TARGETS:%=build-%)
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index a233df6c..2b92d6b7 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -34,10 +34,12 @@ RUN cd /depends && ./install_webp.sh && ./install_imagequant.sh && ./install_raq
 
 RUN /usr/sbin/adduser -D pillow && \
     pip install virtualenv && virtualenv /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p python3.6 /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
diff --git a/amazon-1-amd64/Dockerfile b/amazon-1-amd64/Dockerfile
index 1a7f42f1..dd0cf9cc 100644
--- a/amazon-1-amd64/Dockerfile
+++ b/amazon-1-amd64/Dockerfile
@@ -11,10 +11,12 @@ run yum install -y shadow-utils util-linux xorg-x11-xauth \
 RUN useradd --uid 1000 pillow
 
 RUN bash -c "/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     /usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3"
diff --git a/amazon-2-amd64/Dockerfile b/amazon-2-amd64/Dockerfile
index be21505c..da3c7f15 100644
--- a/amazon-2-amd64/Dockerfile
+++ b/amazon-2-amd64/Dockerfile
@@ -15,6 +15,7 @@ RUN useradd --uid 1000 pillow
 
 RUN bash -c "/usr/bin/pip3 install virtualenv && \
     /usr/bin/python3 -mvirtualenv -p /usr/bin/python3 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy "
diff --git a/arch/Dockerfile b/arch/Dockerfile
index 535da34a..2601cebd 100644
--- a/arch/Dockerfile
+++ b/arch/Dockerfile
@@ -35,10 +35,12 @@ RUN cd /depends && ./install_imagequant.sh && ./install_raqm.sh
 
 RUN /sbin/useradd -m -U -u 1000 pillow && \
     virtualenv2 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install nose cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install nose cffi olefile pytest==4.1.1 pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
diff --git a/ubuntu-trusty-x86/Dockerfile b/archive/ubuntu-14.04-trusty-x86/Dockerfile
similarity index 95%
rename from ubuntu-trusty-x86/Dockerfile
rename to archive/ubuntu-14.04-trusty-x86/Dockerfile
index 99105e6f..51e31054 100644
--- a/ubuntu-trusty-x86/Dockerfile
+++ b/archive/ubuntu-14.04-trusty-x86/Dockerfile
@@ -46,6 +46,7 @@ RUN useradd pillow && addgroup pillow sudo && \
     mkdir /home/pillow && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy
@@ -57,4 +58,4 @@ USER pillow
 ENTRYPOINT ["linux32"]
 CMD ["depends/test.sh"]
 
-#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-trusty-x86
+#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-14.04-trusty-x86
diff --git a/ubuntu-trusty-x86/Makefile b/archive/ubuntu-14.04-trusty-x86/Makefile
similarity index 100%
rename from ubuntu-trusty-x86/Makefile
rename to archive/ubuntu-14.04-trusty-x86/Makefile
diff --git a/ubuntu-trusty-x86/test.sh b/archive/ubuntu-14.04-trusty-x86/test.sh
similarity index 100%
rename from ubuntu-trusty-x86/test.sh
rename to archive/ubuntu-14.04-trusty-x86/test.sh
diff --git a/ubuntu-trusty-x86/update.sh b/archive/ubuntu-14.04-trusty-x86/update.sh
similarity index 100%
rename from ubuntu-trusty-x86/update.sh
rename to archive/ubuntu-14.04-trusty-x86/update.sh
diff --git a/centos-6-amd64/Dockerfile b/centos-6-amd64/Dockerfile
index a31c02f5..80775e3f 100644
--- a/centos-6-amd64/Dockerfile
+++ b/centos-6-amd64/Dockerfile
@@ -12,6 +12,7 @@ RUN useradd --uid 1000 pillow
 
 RUN bash -c "source /opt/rh/python27/enable && \
     /opt/rh/python27/root/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/python27/enable /vpy/bin/activate > /vpy/bin/activate2.7 && \
@@ -19,6 +20,7 @@ RUN bash -c "source /opt/rh/python27/enable && \
     chown -R pillow:pillow /vpy && \
     source /opt/rh/rh-python36/enable && \
     /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \
diff --git a/centos-7-amd64/Dockerfile b/centos-7-amd64/Dockerfile
index 259aaad6..950c3039 100644
--- a/centos-7-amd64/Dockerfile
+++ b/centos-7-amd64/Dockerfile
@@ -13,6 +13,7 @@ RUN useradd --uid 1000 pillow
 
 RUN bash -c "source /opt/rh/python27/enable && \
     /opt/rh/python27/root/usr/bin/virtualenv -p python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/python27/enable /vpy/bin/activate > /vpy/bin/activate2.7 && \
@@ -20,6 +21,7 @@ RUN bash -c "source /opt/rh/python27/enable && \
     chown -R pillow:pillow /vpy && \
     source /opt/rh/rh-python36/enable && \
     /opt/rh/rh-python36/root/usr/bin/virtualenv -p python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     cat /opt/rh/rh-python36/enable /vpy3/bin/activate > /vpy3/bin/activate3.6 && \
diff --git a/debian-stretch-x86/Dockerfile b/debian-stretch-x86/Dockerfile
index ee0c18ae..95bcc671 100644
--- a/debian-stretch-x86/Dockerfile
+++ b/debian-stretch-x86/Dockerfile
@@ -46,10 +46,12 @@ RUN useradd pillow && addgroup pillow sudo && \
     mkdir /home/pillow && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p /usr/bin/python3.5 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
diff --git a/fedora-28-amd64/Dockerfile b/fedora-28-amd64/Dockerfile
index 6be80a52..b117c432 100644
--- a/fedora-28-amd64/Dockerfile
+++ b/fedora-28-amd64/Dockerfile
@@ -12,10 +12,12 @@ RUN useradd pillow && \
     chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
diff --git a/fedora-29-amd64/Dockerfile b/fedora-29-amd64/Dockerfile
index ec32c10c..bbabf309 100644
--- a/fedora-29-amd64/Dockerfile
+++ b/fedora-29-amd64/Dockerfile
@@ -12,10 +12,12 @@ RUN useradd pillow && \
     chown pillow:pillow /home/pillow
 
 RUN /usr/bin/python2.7 /usr/lib/python2.7/site-packages/virtualenv.py --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     /usr/bin/python3.7 /usr/lib/python3.7/site-packages/virtualenv.py --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
diff --git a/ubuntu-xenial-amd64/Dockerfile b/ubuntu-16.04-xenial-amd64/Dockerfile
similarity index 87%
rename from ubuntu-xenial-amd64/Dockerfile
rename to ubuntu-16.04-xenial-amd64/Dockerfile
index 4936bcd3..42fdcad2 100644
--- a/ubuntu-xenial-amd64/Dockerfile
+++ b/ubuntu-16.04-xenial-amd64/Dockerfile
@@ -15,10 +15,12 @@ RUN useradd pillow && addgroup pillow sudo && \
     mkdir /home/pillow && chown pillow:pillow /home/pillow
 
 RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
     /vpy/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy && \
     virtualenv -p /usr/bin/python3.5 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
     /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
     /vpy3/bin/pip install numpy --only-binary=:all: || true && \
     chown -R pillow:pillow /vpy3
@@ -29,4 +31,4 @@ RUN cd /depends && ./install_openjpeg.sh && ./install_imagequant.sh && ./install
 USER pillow
 CMD ["depends/test.sh"]
 
-#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-xenial-amd64
+#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-16.04-xenial-amd64
diff --git a/ubuntu-xenial-amd64/Makefile b/ubuntu-16.04-xenial-amd64/Makefile
similarity index 100%
rename from ubuntu-xenial-amd64/Makefile
rename to ubuntu-16.04-xenial-amd64/Makefile
diff --git a/ubuntu-xenial-amd64/test.sh b/ubuntu-16.04-xenial-amd64/test.sh
similarity index 100%
rename from ubuntu-xenial-amd64/test.sh
rename to ubuntu-16.04-xenial-amd64/test.sh
diff --git a/ubuntu-xenial-amd64/update.sh b/ubuntu-16.04-xenial-amd64/update.sh
similarity index 100%
rename from ubuntu-xenial-amd64/update.sh
rename to ubuntu-16.04-xenial-amd64/update.sh
diff --git a/ubuntu-18.04-bionic-amd64/Dockerfile b/ubuntu-18.04-bionic-amd64/Dockerfile
new file mode 100644
index 00000000..a4bf4bed
--- /dev/null
+++ b/ubuntu-18.04-bionic-amd64/Dockerfile
@@ -0,0 +1,32 @@
+FROM ubuntu:bionic
+
+RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y \
+    install sudo xvfb \
+    git wget python-virtualenv python-numpy python-scipy netpbm \
+    python-pyqt5 ghostscript libffi-dev libjpeg-turbo-progs \
+    python-dev python-setuptools \
+    python3-dev cmake  \
+    libtiff5-dev libjpeg8-dev zlib1g-dev \
+    libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev \
+    python-tk python3-tk \
+    libharfbuzz-dev libfribidi-dev && apt-get clean
+
+RUN useradd pillow && addgroup pillow sudo && \
+    mkdir /home/pillow && chown pillow:pillow /home/pillow
+
+RUN virtualenv -p /usr/bin/python2.7 --system-site-packages /vpy && \
+    /vpy/bin/pip install --upgrade pip && \
+    /vpy/bin/pip install cffi olefile pytest pytest-cov && \
+    chown -R pillow:pillow /vpy && \
+    virtualenv -p /usr/bin/python3.6 --system-site-packages /vpy3 && \
+    /vpy3/bin/pip install --upgrade pip && \
+    /vpy3/bin/pip install cffi olefile pytest pytest-cov && \
+    chown -R pillow:pillow /vpy3
+
+ADD depends /depends
+RUN cd /depends && ./install_openjpeg.sh && ./install_imagequant.sh && ./install_raqm.sh
+
+USER pillow
+CMD ["depends/test.sh"]
+
+#docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/ubuntu-ubuntu-18.04-bionic-amd64-amd64
diff --git a/ubuntu-18.04-bionic-amd64/Makefile b/ubuntu-18.04-bionic-amd64/Makefile
new file mode 120000
index 00000000..5e7b0e26
--- /dev/null
+++ b/ubuntu-18.04-bionic-amd64/Makefile
@@ -0,0 +1 @@
+../Makefile.sub
\ No newline at end of file
diff --git a/ubuntu-18.04-bionic-amd64/test.sh b/ubuntu-18.04-bionic-amd64/test.sh
new file mode 100755
index 00000000..377f8a33
--- /dev/null
+++ b/ubuntu-18.04-bionic-amd64/test.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+source /vpy/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests
+
+source /vpy3/bin/activate
+cd /Pillow
+make clean
+make install-coverage
+/usr/bin/xvfb-run -a pytest -vx --cov PIL --cov-report term Tests
diff --git a/ubuntu-18.04-bionic-amd64/update.sh b/ubuntu-18.04-bionic-amd64/update.sh
new file mode 100755
index 00000000..a374c510
--- /dev/null
+++ b/ubuntu-18.04-bionic-amd64/update.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+docker pull ubuntu:bionic