diff --git a/.travis.yml b/.travis.yml
index 094274b0..7a042c85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,8 @@ matrix:
             python: 3.6
         -   env: TOXENV=pypy
             python: pypy2.7-5.10.0
+        -   env: TOXENV=py37
+            python: 3.7-dev
 install: pip install coveralls tox
 script: tox
 before_install:
diff --git a/setup.py b/setup.py
index b78dafe8..de1df823 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ setup(
         'cfgv>=1.0.0',
         'identify>=1.0.0',
         'nodeenv>=0.11.1',
-        'pyyaml',
+        'pyyaml>=4.2b4',
         'six',
         'toml',
         'virtualenv',
diff --git a/tox.ini b/tox.ini
index 15674934..ddc23193 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 project = pre_commit
 # These should match the travis env list
-envlist = py27,py35,py36,pypy
+envlist = py27,py35,py36,py37,pypy
 
 [testenv]
 deps = -rrequirements-dev.txt