diff --git a/test_runner/cloud_regress/test_cloud_regress.py b/test_runner/cloud_regress/test_cloud_regress.py
index 5ab6fafad7..0940e89f1e 100644
--- a/test_runner/cloud_regress/test_cloud_regress.py
+++ b/test_runner/cloud_regress/test_cloud_regress.py
@@ -60,8 +60,10 @@ def setup(remote_pg: RemotePostgres):
                 "SELECT rolname FROM pg_catalog.pg_roles WHERE oid > 16384 AND rolname <> 'neondb_owner'"
             )
             log.info("Rows count: %s", cur.rowcount)
-            for role in cur:
-                cur.execute(f"DROP ROLE {role[0]}")
+            if cur.rowcount > 0:
+                for role in cur:
+                    log.info("Role found: %s", role[0])
+                    #cur.execute(f"DROP ROLE {role[0]}")
             conn.commit()