diff --git a/.coveragerc b/.coveragerc
index f7c2832d..b55fd36b 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,3 +1,6 @@
+[run]
+branch = True
+
 [report]
 exclude_lines =
     # Have to re-enable the standard pragma
diff --git a/.gitignore b/.gitignore
index 376f2fd4..6b63b3fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .git
 .mypy_cache
 .pytest_cache
+.tox
 __pycache__
 /*.egg-info
 /htmlcov
diff --git a/.travis.yml b/.travis.yml
index dc9f5183..1debc395 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,13 @@ cache: pip
 python:
     - "3.6"
     - "3.7"
+    - "3.8"
 
 install:
     - pip install -U -r requirements.txt
 
 script:
-    - scripts/lint
-    - scripts/test
+    - scripts/ci
 
 after_script:
     - codecov
diff --git a/requirements.txt b/requirements.txt
index cf3a4712..2eae5017 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,3 +13,4 @@ isort
 pytest
 pytest-cov
 starlette
+tox
diff --git a/scripts/tox b/scripts/tox
new file mode 100755
index 00000000..16926fa1
--- /dev/null
+++ b/scripts/tox
@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+tox -r -p all
diff --git a/setup.py b/setup.py
index 282b8136..2a28dc69 100755
--- a/setup.py
+++ b/setup.py
@@ -82,6 +82,7 @@ def get_long_description(long_description_file):
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..fcf6dd27
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,8 @@
+[tox]
+envlist = py{36,37,38}
+
+[testenv]
+deps = -rrequirements.txt
+whitelist_externals = sh
+commands =
+    sh scripts/ci