diff --git a/.travis.yml b/.travis.yml
index c244622f1..d224da0e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,23 +20,17 @@ matrix:
     env: TOXENV=pypy
   # Also run the tests against cryptography master.
   - python: "2.6"
-    env:
-      CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26
+    env: TOXENV=py26-cryptographyMaster
   - python: "2.7"
-    env:
-      CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27
+    env: TOXENV=py27-cryptographyMaster
   - python: "3.2"
-    env:
-      CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32
+    env: TOXENV=py32-cryptographyMaster
   - python: "3.3"
-    env:
-      CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33
+    env: TOXENV=py33-cryptographyMaster
   - python: "3.4"
-    env:
-      CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34
+    env: TOXENV=py34-cryptographyMaster
   - python: "pypy"
-    env:
-      CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy
+    env: TOXENV=pypy-cryptographyMaster
 
   # Also run at least a little bit against an older version of OpenSSL.
   - python: "2.7"
@@ -56,18 +50,15 @@ matrix:
   allow_failures:
   - language: generic
     os: osx
-    env: TOXENV=py27
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py26
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py27
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py32
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py33
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=py34
-  - env: CRYPTOGRAPHY_GIT_MASTER=true TOXENV=pypy
+    env: TOXENV=py27-cryptographyMaster
+  - env: TOXENV=py26-cryptographyMaster
+  - env: TOXENV=py27-cryptographyMaster
+  - env: TOXENV=py32-cryptographyMaster
+  - env: TOXENV=py33-cryptographyMaster
+  - env: TOXENV=py34-cryptographyMaster
+  - env: TOXENV=pypy-cryptographyMaster
   - env: OPENSSL=0.9.8 TOXENV=py27
 
-before_install:
-  - if [ -n "$CRYPTOGRAPHY_GIT_MASTER" ]; then pip install git+https://github.com/pyca/cryptography.git;fi
-
 install:
   - |
     if [[ "$(uname -s)" == 'Darwin' ]]; then
diff --git a/tox.ini b/tox.ini
index da5491606..a90ab2edd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,11 @@
 [tox]
-envlist = pypy,py26,py27,py32,py33,py34
+envlist = {pypy,py26,py27,py32,py33,py34}{,-cryptographyMaster}
 
 [testenv]
 deps =
     setuptools>=7.0  # older setuptools pollute CWD with egg files of dependencies
     coverage
+    cryptographyMaster: git+https://github.com/pyca/cryptography.git
 setenv =
     # Do not allowed the executing environment to pollute the test environment
     # with extra packages.