diff --git a/run_tests.sh b/run_tests.sh
index b9079e9cae..549970bbaa 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -40,7 +40,7 @@ done
 function run_tests {
   # Just run the test suites in current environment
   ${wrapper} rm -f ./$PLUGIN_DIR/tests.sqlite
-  ${wrapper} $NOSETESTS 2> ./$PLUGIN_DIR/run_tests.err.log
+  ${wrapper} $NOSETESTS
 }
 
 NOSETESTS="python ./$PLUGIN_DIR/run_tests.py $noseargs"
@@ -80,13 +80,4 @@ then
   fi
 fi
 
-# FIXME(sirp): bzr version-info is not currently pep-8. This was fixed with
-# lp701898 [1], however, until that version of bzr becomes standard, I'm just
-# excluding the vcsversion.py file
-#
-# [1] https://bugs.launchpad.net/bzr/+bug/701898
-#
-PEP8_EXCLUDE=vcsversion.py
-PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat --show-source"
-PEP8_INCLUDE="bin/* quantum tests tools run_tests.py"
-run_tests && pep8 $PEP8_OPTIONS $PEP8_INCLUDE || exit 1
+run_tests