diff --git a/.travis.yml b/.travis.yml
index a7026bae..db8213c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "pypy"
 before_install:
   - "pushd .."
   - "git clone https://github.com/pulp/pulp.git --branch 2.7-dev"
diff --git a/run-tests.py b/run-tests.py
index 5aca10ca..abfbe87c 100755
--- a/run-tests.py
+++ b/run-tests.py
@@ -24,7 +24,7 @@
 
 # Check the code for PEP-257 compliance
 # We should remove some of these over time
-pep257_fail_ignore_codes = 'D100,D103,D200,D202,D203,D205,D400,D401,D402'
+pep257_fail_ignore_codes = 'D100,D103,D104,D200,D202,D203,D205,D400,D401,D402'
 
 print "checking pep257 for failures, ignoring %s" % pep257_fail_ignore_codes
 exit_code = subprocess.call(['pep257', '--ignore=' + pep257_fail_ignore_codes])
diff --git a/test_requirements.txt b/test_requirements.txt
index 8d22e2be..9f971c9d 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -2,7 +2,7 @@ coverage
 coveralls
 flake8
 flake8-import-order
-mock
+mock<1.1
 nose
 nosexcover
 pep257