diff --git a/.travis.yml b/.travis.yml
index 4ea96d6f..642c7d41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
+  - "3.6"
   - "pypy-5.3.1"
 
 env:
@@ -19,7 +20,7 @@ matrix:
 
 install:
   - ".travis/install.sh"
-before_script: "flake8 --max-complexity 15 hyper test"
+before_script: "flake8 hyper test"
 
 script:
   - ".travis/run.sh"
diff --git a/.travis/run.sh b/.travis/run.sh
index 43d9dd65..321835de 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -6,7 +6,7 @@ set -x
 if [[ "$TEST_RELEASE" == true ]]; then
     py.test test_release.py
 else
-    if [[ $TRAVIS_PYTHON_VERSION == pypy ]]; then
+    if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then
         py.test test/
     else
         coverage run -m py.test test/
diff --git a/setup.cfg b/setup.cfg
index 5e409001..53d397a8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,5 @@
 [wheel]
 universal = 1
+
+[flake8]
+max-complexity = 15
diff --git a/test/test_SSLContext.py b/test/test_SSLContext.py
index 4add16f3..66f5d358 100644
--- a/test/test_SSLContext.py
+++ b/test/test_SSLContext.py
@@ -40,7 +40,6 @@ def test_custom_context(self):
 
         assert not hyper.tls._context.check_hostname
         assert hyper.tls._context.verify_mode == ssl.CERT_NONE
-        assert hyper.tls._context.options & ssl.OP_NO_COMPRESSION == 0
 
     def test_HTTPConnection_with_custom_context(self):
         context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
diff --git a/test_requirements.txt b/test_requirements.txt
index dcaff945..cae2fbc6 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -1,4 +1,4 @@
-pytest>=2.7
+pytest>=3.0
 pytest-xdist
 pytest-cov
 requests
diff --git a/tox.ini b/tox.ini
index 311f9c97..046619e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, pypy, lint
+envlist = py{27,34,35,36}, pypy, lint
 
 [testenv]
 deps= -r{toxinidir}/test_requirements.txt
@@ -12,6 +12,6 @@ commands=
 commands= py.test {toxinidir}/test/
 
 [testenv:lint]
-basepython=python3.5
+basepython=python3
 deps = flake8==2.5.4
-commands = flake8 --max-complexity 15 hyper test
+commands = flake8 hyper test