diff --git a/contrib/ipaextractor.py b/contrib/ipaextractor.py
index 4a209cace..08fa7b763 100644
--- a/contrib/ipaextractor.py
+++ b/contrib/ipaextractor.py
@@ -362,4 +362,4 @@ def main():
                                           pprint.pformat(resp.json())))
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
diff --git a/contrib/zoneextractor.py b/contrib/zoneextractor.py
index d30f5fd72..5e7abdace 100644
--- a/contrib/zoneextractor.py
+++ b/contrib/zoneextractor.py
@@ -208,4 +208,4 @@ def main():
         LOG.error(e)
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
diff --git a/devstack/networking_test.py b/devstack/networking_test.py
index f5ef17596..d6b26ad4c 100644
--- a/devstack/networking_test.py
+++ b/devstack/networking_test.py
@@ -46,6 +46,7 @@ import os
 import random
 import string
 import time
+import sys
 
 import dns
 import dns.resolver
@@ -660,4 +661,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
diff --git a/devstack/statsd_mock_server.py b/devstack/statsd_mock_server.py
index d65a45816..2b195d9b2 100755
--- a/devstack/statsd_mock_server.py
+++ b/devstack/statsd_mock_server.py
@@ -19,6 +19,7 @@ Log to stdout or to a file.
 """
 
 from argparse import ArgumentParser
+import sys
 from time import gmtime
 from time import strftime
 import SocketServer
@@ -57,4 +58,4 @@ def main():
     server.serve_forever()
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())
diff --git a/tools/pretty_flake8.py b/tools/pretty_flake8.py
index 2688cccfa..ca7a481dc 100755
--- a/tools/pretty_flake8.py
+++ b/tools/pretty_flake8.py
@@ -88,4 +88,4 @@ def format_dict(raw):
     return output
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())