diff --git a/README.rst b/README.rst
index 49e2428..c3327cd 100644
--- a/README.rst
+++ b/README.rst
@@ -49,8 +49,8 @@ Update your Django settings and use it like any other Django storage module::
 Features
 --------
 
-* Fully tested on Python 2.7, 3.4 - 3.7, PyPy 2.7-6.0.0 and PyPy 3.5-6.0.0 with
-  Django 1.11 and 2.0 - 2.1
+* Fully tested on Python 2.7, 3.4 - 3.7, PyPy 2.7-7.1.1 and PyPy 3.6-7.1.1 with
+  Django 1.11 and 2.1 - 2.2
 * Files are locally downloaded as SpooledTemporaryFile objects to avoid memory
   abuse
 * Changed files will automatically be reuploaded to GCS when closed
diff --git a/tox.ini b/tox.ini
index 2ee5347..6bed966 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 envlist =
-    {py27,py34,py35,py36,pypy,pypy3}-django111,
-    {py34,py35,py36,py37,pypy3}-{django20,django21},
+    {py27,py34,py35,py36,py37,pypy2,pypy3}-django111,
+    {py35,py36,py37,pypy3}-{django21,django22},
 [testenv]
 deps =
     -rrequirements-test.txt
     django111: django<1.12
-    django20: django<2.1
     django21: django<2.2
+    django22: django<2.3
 commands = py.test {posargs}
 [pytest]
 DJANGO_SETTINGS_MODULE = test_app.app.settings