diff --git a/.travis.yml b/.travis.yml
index 36c38d631..e1433a173 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,10 @@ matrix:
           os: linux
           dist: trusty
           env: TOXENV=py35
+        - python: 3.6
+          os: linux
+          dist: trusty
+          env: TOXENV=py36
         - python: 3.5
           os: linux
           dist: trusty
@@ -28,6 +32,10 @@ matrix:
           os: osx
           osx_image: xcode6.4
           env: TOXENV=py35
+        - language: generic
+          os: osx
+          osx_image: xcode6.4
+          env: TOXENV=py36
     allow_failures:
         - os: osx
 
diff --git a/Vagrantfile b/Vagrantfile
index df636ce3e..26dcfc044 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -223,6 +223,7 @@ def install_pythons(boxname)
     . ~/.bash_profile
     pyenv install 3.4.0  # tests
     pyenv install 3.5.0  # tests
+    pyenv install 3.6.0  # tests
     pyenv install 3.5.2  # binary build, use latest 3.5.x release
     pyenv rehash
   EOF
@@ -315,7 +316,7 @@ def run_tests(boxname)
     . ../borg-env/bin/activate
     if which pyenv 2> /dev/null; then
       # for testing, use the earliest point releases of the supported python versions:
-      pyenv global 3.4.0 3.5.0
+      pyenv global 3.4.0 3.5.0 3.6.0
     fi
     # otherwise: just use the system python
     if which fakeroot 2> /dev/null; then
diff --git a/setup.py b/setup.py
index 00e48f3f3..4f2ca8681 100644
--- a/setup.py
+++ b/setup.py
@@ -292,6 +292,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Security :: Cryptography',
         'Topic :: System :: Archiving :: Backup',
     ],
diff --git a/tox.ini b/tox.ini
index 699ef251a..d44009e46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{34,35},flake8
+envlist = py{34,35,36},flake8
 
 [testenv]
 # Change dir to avoid import problem for cython code. The directory does