diff --git a/bin/glance-upload b/bin/glance-upload
index dd5dd35f44..de202580fa 100755
--- a/bin/glance-upload
+++ b/bin/glance-upload
@@ -41,7 +41,7 @@ from glance.client import Client
 
 
 def die(msg):
-    print >>sys.stderr, msg
+    print >> sys.stderr, msg
     sys.exit(1)
 
 
diff --git a/run_tests.sh b/run_tests.sh
index 32deec831d..bc0cda38ce 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/* glance setup.py run_tests.py
+run_tests && pep8 --repeat --show-pep8 --show-source bin/* glance setup.py run_tests.py || exit 1