diff --git a/.gitignore b/.gitignore
index 83b94e0..6380f84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.py[co]
 .tox
 _test_run/
 bin/
@@ -5,3 +6,5 @@ include/
 lib/
 .Python
 bumpversion.egg-info/
+.pytest_cache/
+__pycache__/
diff --git a/.travis.yml b/.travis.yml
index 13248d3..db40eb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,13 @@
 language: python
+python:
+  - "3.6"
+  - "3.5"
+  - "3.4"
+  - "3.3"
+  - "3.2"
+  - "2.7"
+  - "pypy2.7"
 
-env:
-  - TOX_ENV=py27
-  - TOX_ENV=py27-configparser
-  - TOX_ENV=py32
-  - TOX_ENV=py33
-  - TOX_ENV=py34
-  - TOX_ENV=pypy
 install:
   - git config --global user.email "bumpversion-test-git@travis.ci"
   - git config --global user.name "Testing Git on Travis CI"
@@ -14,8 +15,8 @@ install:
   - git config --list
   - echo -e '[ui]\nusername = Testing Mercurial on Travis CI <bumpversion-test-hg@travis.ci>' > ~/.hgrc
   - hg --version
-  - pip install --upgrade pytest tox
+  - pip install --upgrade pytest tox-travis
 
 script:
-  - tox -e $TOX_ENV
+  - tox
 
diff --git a/requirements_dev.txt b/requirements_dev.txt
new file mode 100644
index 0000000..6088d0e
--- /dev/null
+++ b/requirements_dev.txt
@@ -0,0 +1,2 @@
+pytest==3.6.0
+tox==3.0.0
diff --git a/setup.py b/setup.py
index 349441f..c51d83b 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,8 @@
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: PyPy',
     ),
 )
diff --git a/tox.ini b/tox.ini
index 0f78c95..5d09dd9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,26 @@
 [tox]
-envlist = py34, py33, py32, py27, py27-configparser, pypy
+envlist = py36, py35, py34, py33, py32, py27, py27-configparser, pypy
 
 [testenv]
 passenv = HOME
 deps=
-  distribute
   pytest
   mock
+basepython=
+    py36: python3.6
+    py35: python3.5
+    py34: python3.4
+    py33: python3.3
+    py32: python3.2
+    py27: python2.7
+    pypy: pypy
 commands=
   py.test [] tests
 
 [testenv:py27-configparser]
-basepython= python2.7
+basepython = python2.7
 deps=
+  distribute
   pytest
   mock
   configparser