diff --git a/run_tests.sh b/run_tests.sh
index 0574643c5a9a..786fa70c652c 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -71,6 +71,4 @@ then
   fi
 fi
 
-run_tests
-
-pep8 --repeat --show-pep8 --show-source bin/* nova setup.py
+run_tests && pep8 --repeat --show-pep8 --show-source bin/* nova setup.py || exit 1