diff --git a/.appveyor.yml b/.appveyor.yml
index 3725ea3ff..129a84c35 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,6 +7,9 @@ environment:
   matrix:
     - PYTHON: "C:\\Python35"
       TOXENV: "py35"
+    # TODO: ENABLE WHEN AVAILABLE
+    # - PYTHON: "C:\\Python36"
+    #   TOXENV: "py36"
 
   SNAPSHOT_HOST:
     secure: NeTo57s2rJhCd/mjKHetXVxCFd3uhr8txnjnAXD1tUI=
diff --git a/.travis.yml b/.travis.yml
index c078e30ac..e4c8dd8c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,15 @@ matrix:
             - libssl-dev
     - python: 3.5
       env: TOXENV=py35 BDIST=1 OPENSSL_ALPN
+      addons:
+        apt:
+          sources:
+            # Debian sid currently holds OpenSSL 1.1.0
+            # change this with future releases!
+            - debian-sid
+          packages:
+    - python: 3.6
+      env: TOXENV=py36 OPENSSL_ALPN
       addons:
         apt:
           sources:
diff --git a/dev.sh b/dev.sh
index 4a2b766ac..95e8b7733 100755
--- a/dev.sh
+++ b/dev.sh
@@ -2,7 +2,7 @@
 set -e
 set -x
 
-PYVERSION=3.5
+PYVERSION=${1:-3.5}
 VENV="venv$PYVERSION"
 
 echo "Creating dev environment in $VENV using Python $PYVERSION"
diff --git a/setup.py b/setup.py
index 08708b315..fa20e7cf2 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@ setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Security",
diff --git a/tox.ini b/tox.ini
index da5446c34..85c962f7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-envlist = py35, docs, lint
+envlist = py35, py36, docs, lint
 skipsdist = True
 toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]
-basepython = python3.5
 deps =
   {env:CI_DEPS:}
   -rrequirements.txt