diff --git a/.travis.yml b/.travis.yml
index 13248d3..3ae6474 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ env:
   - TOX_ENV=py32
   - TOX_ENV=py33
   - TOX_ENV=py34
+  - TOX_ENV=py35
   - TOX_ENV=pypy
 install:
   - git config --global user.email "bumpversion-test-git@travis.ci"
diff --git a/appveyor.yml b/appveyor.yml
index 05c2f3f..91df279 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,6 +17,9 @@ environment:
     - PYTHON: "C:/Python34"
       TOXENV: "py34"
 
+    - PYTHON: "C:/Python35"
+      TOXENV: "py35"
+
 init:
   - "ECHO %TOXENV%"
   - "ECHO %PYTHON%"
diff --git a/setup.py b/setup.py
index 349441f..ee8e6f1 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,7 @@
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: PyPy',
     ),
 )
diff --git a/tox.ini b/tox.ini
index 0f78c95..f6b7c13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34, py33, py32, py27, py27-configparser, pypy
+envlist = py35, py34, py33, py32, py27, py27-configparser, pypy
 
 [testenv]
 passenv = HOME