diff --git a/.travis.yml b/.travis.yml
index 15f1e194f0b639bf816f286e31f0255542704e78..36ce2b6f60b797358fcdaccb16c5e199335a310f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,21 @@ install:
   - 'if [ -n "${VAR+x}" ]; then: invoke install-nacl --library=$NACL; fi'
   - 'if [ -n "${VAR+x}" ]; then: invoke install --dev; fi'
 script:
-  - invoke tests --suite=$SUITE --libpath=/usr/local/lib
+  - invoke tests --suite=$SUITE
 env:
-  - NACL=libsodium SUITE=unit
-  - "SUITE=pep8,lint"
+  global:
+    - LD_LIBRARY_PATH=/usr/local/lib
+    - LD_RUN_PATH=/usr/local/lib
+  matrix:
+    - NACL=libsodium SUITE=unit
+    - "SUITE=pep8,lint"
+matrix:
+  exclude:
+    - python: "2.6"
+      env: "SUITE=pep8,lint"
+    - python: "2.7"
+      env: "SUITE=pep8,lint"
+    - python: "3.2"
+      env: "SUITE=pep8,lint"
+    - python: "pypy"
+      env: "SUITE=pep8,lint"
diff --git a/tasks.py b/tasks.py
index 0e23f69a858d8865034541bfdc6603925d1a2a68..68ce44a7f442a462242c241d2702536639f37351 100644
--- a/tasks.py
+++ b/tasks.py
@@ -66,11 +66,7 @@ def install(dev=False):
 
 
 @task
-def tests(libpath=None, suite=None):
-    if libpath is not None:
-        os.environ["LD_LIBRARY_PATH"] = libpath
-        os.environ["LD_RUN_PATH"] = libpath
-
+def tests(suite=None):
     if suite is None:
         suite = set(["pep8", "lint", "unit"])
     else: