diff --git a/run-tests.sh b/run-tests.sh
index ce62ea5a..43ef17b7 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -41,16 +41,16 @@ fi
 
 echo "Installing dependencies…"
 PIPENV_PYTHON=2.7 pipenv run pip install -e . --upgrade
-PIPENV_PYTHON=3.6 pipenv run pip install -e . --upgrade
+PIPENV_PYTHON=3.7 pipenv run pip install -e . --upgrade
 PIPENV_PYTHON=2.7 pipenv install --dev
-PIPENV_PYTHON=3.6 pipenv install --dev
+PIPENV_PYTHON=3.7 pipenv install --dev
 
 echo "$ pipenv run time pytest -v -n auto tests -m \"$TEST_SUITE\""
 # PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" | prefix 2.7 &
 # PIPENV_PYTHON=3.6 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE" | prefix 3.6
 # Better to run them sequentially.
-PIPENV_PYTHON=2.7 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE"
-PIPENV_PYTHON=3.6 pipenv run time pytest -v -n auto tests -m "$TEST_SUITE"
+PIPENV_PYTHON=2.7 pipenv run time pytest
+PIPENV_PYTHON=3.7 pipenv run time pytest
 
 # test revendoring
 pip3 install --upgrade invoke requests parver
diff --git a/setup.py b/setup.py
index a2a29c3e..6cc2205b 100644
--- a/setup.py
+++ b/setup.py
@@ -136,6 +136,7 @@ setup(
         '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',
     ],