diff --git a/oslo_upgradecheck/__main__.py b/oslo_upgradecheck/__main__.py
index 2cfafb3..05a0bd6 100644
--- a/oslo_upgradecheck/__main__.py
+++ b/oslo_upgradecheck/__main__.py
@@ -14,6 +14,8 @@
 
 """Example CLI command for running upgrade checks"""
 
+import sys
+
 from oslo_upgradecheck import upgradecheck
 
 
@@ -33,8 +35,8 @@ class Checks(upgradecheck.UpgradeCommands):
 
 def main():
     inst = Checks()
-    upgradecheck.main(inst.check)
+    return upgradecheck.main(inst.check)
 
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
diff --git a/oslo_upgradecheck/tests/test_upgradecheck.py b/oslo_upgradecheck/tests/test_upgradecheck.py
index f6bdc42..a89ace9 100644
--- a/oslo_upgradecheck/tests/test_upgradecheck.py
+++ b/oslo_upgradecheck/tests/test_upgradecheck.py
@@ -77,4 +77,5 @@ class TestMain(base.BaseTestCase):
         mock_argv = ['test-status', 'upgrade', 'check']
         with mock.patch.object(sys, 'argv', mock_argv, create=True):
             inst = TestCommands()
-            upgradecheck.main(inst.check)
+            result = upgradecheck.main(inst.check)
+            self.assertEqual(upgradecheck.UpgradeCheckCode.FAILURE, result)
diff --git a/oslo_upgradecheck/upgradecheck.py b/oslo_upgradecheck/upgradecheck.py
index 93fa03f..4bc271d 100644
--- a/oslo_upgradecheck/upgradecheck.py
+++ b/oslo_upgradecheck/upgradecheck.py
@@ -148,4 +148,4 @@ def main(check_callback):
     conf.register_cli_opt(opt)
     conf(sys.argv[1:])
 
-    conf.category.action_fn()
+    return conf.category.action_fn()