diff --git a/setup/test.py b/setup/test.py
index 48a9fc1147..0a9fd14b2e 100644
--- a/setup/test.py
+++ b/setup/test.py
@@ -68,6 +68,9 @@ class Test(BaseTest):
         if opts.exclude_test_name:
             tests = remove_tests_by_name(tests, *opts.exclude_test_name)
         run_cli(tests, verbosity=opts.test_verbosity, buffer=not opts.test_name)
+        if is_ci:
+            print('run_cli returned', flush=True)
+            raise SystemExit(0)
 
 
 class TestRS(BaseTest):