diff --git a/.travis.yml b/.travis.yml
index 65b92622..a6f17c3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "pypy"
 
 sudo: false
diff --git a/requirements-install.sh b/requirements-install.sh
index 7ba9396f..d110bcef 100755
--- a/requirements-install.sh
+++ b/requirements-install.sh
@@ -1,7 +1,5 @@
 #!/bin/bash -ex
 
-pip install pip==6.1.0
-
 pip install -U -r requirements-test.txt
 
 if [[ $USE_OPTIONAL == "true" ]]; then
diff --git a/setup.py b/setup.py
index 6f0fc17e..cdb63fd3 100644
--- a/setup.py
+++ b/setup.py
@@ -70,6 +70,7 @@ def default_environment():
     'Programming Language :: Python :: 3.3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
     'Topic :: Software Development :: Libraries :: Python Modules',
     'Topic :: Text Processing :: Markup :: HTML'
 ]
diff --git a/tox.ini b/tox.ini
index 43528d0c..17c5db4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py33,py34,py35,pypy}-{base,optional}
+envlist = {py26,py27,py33,py34,py35,py36,pypy}-{base,optional}
 
 [testenv]
 deps =