diff --git a/src/test/regress/citus_tests/common.py b/src/test/regress/citus_tests/common.py
index 7f9a3f349..53c9c7944 100644
--- a/src/test/regress/citus_tests/common.py
+++ b/src/test/regress/citus_tests/common.py
@@ -453,6 +453,9 @@ def cleanup_test_leftovers(nodes):
     for node in nodes:
         node.cleanup_schemas()
 
+    for node in nodes:
+        node.cleanup_databases()
+
     for node in nodes:
         node.cleanup_users()
 
diff --git a/src/test/regress/citus_tests/test/test_maintenancedeamon.py b/src/test/regress/citus_tests/test/test_maintenancedeamon.py
index bf1a48b19..3f6cb501e 100644
--- a/src/test/regress/citus_tests/test/test_maintenancedeamon.py
+++ b/src/test/regress/citus_tests/test/test_maintenancedeamon.py
@@ -72,5 +72,3 @@ def test_set_maindb(cluster_factory):
         )
         == 0
     )
-
-    cluster.coordinator.cleanup_databases()