diff --git a/.travis.yml b/.travis.yml
index 55aab989d..598e7b99c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,13 @@ jobs:
       script: tox -- --exitfirst -m unit
       after_success: codecov --disable search --flags unittests
 
+    - stage: unit-test
+      python: "3.6"
+      env: TOXENV=py36-sqlite
+      install: pip install codecov tox
+      script: tox -- --exitfirst -m unit
+      after_success: codecov --disable search --flags unittests
+
     - stage: integration-test
       python: "2.7"
       env: TOXENV=py27-sqlite
@@ -49,6 +56,12 @@ jobs:
       script: tox -- --exitfirst -m functional -k 'not harvesting'
       after_success: codecov --disable search --flags integrationtests
 
+    - stage: integration-test
+      python: "3.6"
+      env: TOXENV=py36-sqlite
+      install: pip install codecov tox
+      script: tox -- --exitfirst -m functional -k 'not harvesting'
+      after_success: codecov --disable search --flags integrationtests
 
 addons:
   apt:
diff --git a/setup.py b/setup.py
index 9ff85e1bc..ee20ab460 100644
--- a/setup.py
+++ b/setup.py
@@ -90,6 +90,7 @@ def read(filename, encoding="utf-8"):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Scientific/Engineering :: GIS',
     ]
 )
diff --git a/tox.ini b/tox.ini
index fb835ff7f..823b6613d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = {py27,py34,py35}-sqlite
+envlist = {py27,py34,py35,py36}-sqlite
 skip_missing_interpreters = True