diff --git a/refstack-client b/refstack-client
index 39bbd25..7e5250c 100755
--- a/refstack-client
+++ b/refstack-client
@@ -28,4 +28,4 @@ from refstack_client import refstack_client
 if __name__ == '__main__':
     args = refstack_client.parse_cli_args()
     test = refstack_client.RefstackClient(args)
-    getattr(test, args.func)()
+    raise SystemExit(getattr(test, args.func)())
diff --git a/refstack_client/refstack_client.py b/refstack_client/refstack_client.py
index d1d3717..bead06c 100755
--- a/refstack_client/refstack_client.py
+++ b/refstack_client/refstack_client.py
@@ -459,6 +459,7 @@ class RefstackClient:
         else:
             self.logger.error("Problem executing Tempest script. Exit code %d",
                               process.returncode)
+        return process.returncode
 
     def upload(self):
         '''Perform upload to RefStack URL.'''