diff --git a/tools/cli/tests/end-to-end.py b/tools/cli/tests/end-to-end.py
index 06fc4b853..a2c0cf44a 100755
--- a/tools/cli/tests/end-to-end.py
+++ b/tools/cli/tests/end-to-end.py
@@ -187,8 +187,8 @@ def retry_test(self, test_method):
             try:
                 test_method()
                 return
-            except AssertionError as ae:
-                last_error = ae
+            except Exception as ex:
+                last_error = ex
         raise last_error
 
     def test_create_delete(self):