diff --git a/appveyor.yml b/appveyor.yml
index 05c975bb..4fc8afec 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,17 +13,19 @@ environment:
   - TOXENV: "py36-pytest29"
   - TOXENV: "py36-pytest30"
   - TOXENV: "py36-pytest31"
+  - TOXENV: "py37-pytest30"
+  - TOXENV: "py37-pytest31"
 
 install:
   - echo Installed Pythons
   - dir c:\Python*
 
-  - C:\Python36\python -m pip install --upgrade --pre tox
+  - C:\Python37\python -m pip install --upgrade --pre tox
 
 build: false  # Not a C# project, build stuff at the test step instead.
 
 test_script:
-  - C:\Python36\python -m tox
+  - C:\Python37\python -m tox
 
 # We don't deploy anything on tags with AppVeyor, we use Travis instead, so we
 # might as well save resources
diff --git a/doc/install.txt b/doc/install.txt
index fb4056d1..95c77967 100644
--- a/doc/install.txt
+++ b/doc/install.txt
@@ -7,7 +7,7 @@ installation info in a nutshell
 
 **PyPI name**: py_
 
-**Pythons**: CPython 2.7, 3.4, 3.5, 3.6, PyPy-5.4
+**Pythons**: CPython 2.7, 3.4, 3.5, 3.6, 3.7, PyPy-5.4
 
 **Operating systems**: Linux, Windows, OSX, Unix
 
diff --git a/setup.py b/setup.py
index a0d723c3..a8a80e35 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,7 @@ def main():
                      'Programming Language :: Python :: 3.4',
                      'Programming Language :: Python :: 3.5',
                      'Programming Language :: Python :: 3.6',
+                     'Programming Language :: Python :: 3.7',
                      'Programming Language :: Python :: Implementation :: CPython',
                      'Programming Language :: Python :: Implementation :: PyPy',
                     ],
diff --git a/tox.ini b/tox.ini
index d5f362ae..71aa823d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist=py{27,34,35,36}-pytest{29,30,31}
+# Skip py37-pytest29 as such a combination does not work (#192)
+envlist=py{27,34,35,36}-pytest{29,30,31},py37-pytest{30,31}
 
 [testenv]
 changedir=testing