diff --git a/src/test/regress/citus_tests/common.py b/src/test/regress/citus_tests/common.py
index 12cc8d54d..785ebcc1f 100644
--- a/src/test/regress/citus_tests/common.py
+++ b/src/test/regress/citus_tests/common.py
@@ -1056,7 +1056,7 @@ class Postgres(QueryRunner):
     def cleanup_databases(self):
         for database in self.databases:
             self.sql(
-                sql.SQL("DROP DATABASE IF EXISTS {}").format(sql.Identifier(database))
+                sql.SQL("DROP DATABASE IF EXISTS {} WITH (FORCE)").format(sql.Identifier(database))
             )
 
     def cleanup_schemas(self):
diff --git a/src/test/regress/citus_tests/test/test_multiple_databases_distributed_deadlock_detection.py b/src/test/regress/citus_tests/test/test_multiple_databases_distributed_deadlock_detection.py
index 99ff15492..6db6db69f 100644
--- a/src/test/regress/citus_tests/test/test_multiple_databases_distributed_deadlock_detection.py
+++ b/src/test/regress/citus_tests/test/test_multiple_databases_distributed_deadlock_detection.py
@@ -25,7 +25,7 @@ async def test_multiple_databases_distributed_deadlock_detection(cluster):
     for db_name in db_names:
         nodes = cluster.workers + [cluster.coordinator]
         for node in nodes:
-            node.sql(f"CREATE DATABASE {db_name}")
+            node.create_database(f"{db_name}")
             with node.cur(dbname=db_name) as node_cursor:
                 node_cursor.execute("CREATE EXTENSION citus;")
                 if node == cluster.coordinator: