diff --git a/.travis.yml b/.travis.yml
index f3c75a1..8f03127 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
    - "3.3"
    - "3.4"
    - "3.5"
+   - "3.6"
    - "pypy"
    - "pypy3"
 install:
diff --git a/README.rst b/README.rst
index 89ffe4e..b135137 100644
--- a/README.rst
+++ b/README.rst
@@ -21,7 +21,7 @@ This library contains:
 Installation
 ------------
 
-python-geojson is compatible with Python 2.6, 2.7, 3.2, 3.3, 3.4 and 3.5. It is listed on `PyPi as 'geojson'`_. The recommended way to install is via pip_:
+python-geojson is compatible with Python 2.6, 2.7, 3.2, 3.3, 3.4, 3.5 and 3.6. It is listed on `PyPi as 'geojson'`_. The recommended way to install is via pip_:
 
 .. code::
 
diff --git a/setup.py b/setup.py
index 3166430..bdd0218 100644
--- a/setup.py
+++ b/setup.py
@@ -70,6 +70,7 @@ def test_suite():
         "Programming Language :: Python :: 3.3",
         "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 e4608b3..767887a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py{27,33,34,35}, pypy, pypy3
+envlist = py{27,33,34,35,36}, pypy, pypy3
 
 [testenv]
 commands = {envpython} setup.py test