diff --git a/.travis.yml b/.travis.yml
index 138466010a..cf55f75587 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ env:
         - TASK=check-pypy
         - TASK=check-py27
         - TASK=check-py36
+        - TASK=check-py37
         - TASK=check-quality
 
         # Less important tests that will probably
diff --git a/Makefile b/Makefile
index 832c28a5e1..d310a48596 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ PY273=$(BUILD_RUNTIMES)/snakepit/python2.7.3
 PY34=$(BUILD_RUNTIMES)/snakepit/python3.4
 PY35=$(BUILD_RUNTIMES)/snakepit/python3.5
 PY36=$(BUILD_RUNTIMES)/snakepit/python3.6
+PY37=$(BUILD_RUNTIMES)/snakepit/python3.7
 PYPY=$(BUILD_RUNTIMES)/snakepit/pypy
 
 BEST_PY3=$(PY36)
@@ -55,6 +56,9 @@ $(PY35):
 $(PY36):
 	scripts/retry.sh scripts/install.sh 3.6
 
+$(PY37):
+	scripts/retry.sh scripts/install.sh 3.7
+
 
 $(PYPY):
 	scripts/retry.sh scripts/install.sh pypy
@@ -130,6 +134,9 @@ check-py35: $(PY35) $(TOX)
 check-py36: $(BEST_PY3) $(TOX)
 	$(TOX) --recreate -e py36-full
 
+check-py37: $(PY37) $(TOX)
+	$(TOX) --recreate -e py37-full
+
 check-pypy: $(PYPY) $(TOX)
 	$(TOX) --recreate -e pypy-full
 
diff --git a/tox.ini b/tox.ini
index 44b9a34ef2..3c7a188a94 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35,36,py}-{brief,prettyquick,full,custom,benchmark}
+envlist = py{27,34,35,36,37,py}-{brief,prettyquick,full,custom,benchmark}
 toxworkdir={env:TOX_WORK_DIR:.tox}
 
 passenv=