diff --git a/run_tests.py b/run_tests.py
index 6e809a439e38ceacded74b2b4a039e1b6e610957..0fdde8c020e8cc6da7f8a7312ad821c347068ad1 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -1,9 +1,16 @@
 #!/usr/bin/env python
+import sys
 import unittest
 
-#Run all tests
-if __name__ == '__main__':
+
+# Run all tests
+def main(args=None):
     test_loader = unittest.TestLoader()
     test_suite = test_loader.discover('tests', pattern='test_*.py')
     runner = unittest.TextTestRunner()
-    runner.run(test_suite)
+    results = runner.run(test_suite)
+    return results.wasSuccessful()
+
+
+if __name__ == '__main__':
+    sys.exit(0 if main(sys.argv[1:]) else 1)