diff --git a/.travis.yml b/.travis.yml
index 4c9d369..3ad5d5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,16 @@
+dist: xenial
+
 language: python
 python:
   - "2.7"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8-dev"
+
+matrix:
+  allow_failures:
+    - python: "3.8-dev"
 
 install:
   - make bootstrap
diff --git a/README.md b/README.md
index e5e9b9b..da84771 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ make bootstrap
 make test
 ```
 
+You can use [tox](https://tox.readthedocs.io) to run tests as well.
+```bash
+tox
+```
+
 ### Releases
 
 Before new release, add a summary of changes since last version to CHANGELOG.rst
diff --git a/setup.py b/setup.py
index 75085f3..34fee93 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,9 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
@@ -28,10 +31,10 @@
     extras_require={
         'tests': [
             'doubles',
-            'flake8<3',  # see https://github.com/zheller/flake8-quotes/issues/29
+            'flake8',
             'flake8-quotes',
             'mock<1.1.0',
-            'pytest>=2.7,<3',
+            'pytest',
             'pytest-cov',
             'pytest-mock',
             'Sphinx',
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..772b6bf
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,7 @@
+[tox]
+envlist = py27,py35,py36,py37
+
+[testenv]
+install_command = pip install {opts} {packages} {env:PWD}[tests]
+whitelist_externals = make
+commands =  make test lint