diff --git a/.travis.yml b/.travis.yml
index dc4b1ea..131ce8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ env:
     - TOXENV=py27
     - TOXENV=py34
     - TOXENV=py35
+    - TOXENV=py36
 
 install:
     - pip install -U tox nose cython
diff --git a/appveyor.yml b/appveyor.yml
index c651e32..d72d295 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,10 +3,12 @@ environment:
     - PYTHON: "C:\\Python27"
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python35"
+    - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python34-x64"
       DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
+    - PYTHON: "C:\\Python36-x64"
 
 install:
   - "%PYTHON%\\python.exe -m pip install -U pip wheel nose cython"
diff --git a/dockerfiles/buildwheel.sh b/dockerfiles/buildwheel.sh
index b654e45..1d5365e 100755
--- a/dockerfiles/buildwheel.sh
+++ b/dockerfiles/buildwheel.sh
@@ -4,7 +4,7 @@ set -e -x
 ARCH=`uname -p`
 echo "arch=$ARCH"
 
-for V in cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
+for V in cp36-cp36m cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
     PYBIN=/opt/python/$V/bin
     rm -rf build/       # Avoid lib build by narrow Python is used by wide python
     $PYBIN/python setup.py bdist_wheel -p manylinux1_${ARCH}
diff --git a/tox.ini b/tox.ini
index d9d1e5b..482938b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35
+envlist = py27, py34, py35, py36
 
 [testenv]
 commands =