diff --git a/frappe/parallel_test_runner.py b/frappe/parallel_test_runner.py
index c116b7d0f3..ed2840bfaa 100644
--- a/frappe/parallel_test_runner.py
+++ b/frappe/parallel_test_runner.py
@@ -24,7 +24,7 @@ if click_ctx:
 TEST_WEIGHT_OVERRIDES = {
 	# XXX: command tests are significantly overweight, need a better heuristic than test count
 	# Possible better solution: stats from previous test runs.
-	"test_commands.py": 20,
+	"test_commands.py": 10,
 }
 
 
diff --git a/frappe/tests/classes/integration_test_case.py b/frappe/tests/classes/integration_test_case.py
index b52095962f..c438ac5358 100644
--- a/frappe/tests/classes/integration_test_case.py
+++ b/frappe/tests/classes/integration_test_case.py
@@ -63,7 +63,7 @@ class IntegrationTestCase(UnitTestCase):
 			frappe.db.before_commit.add(_commit_watcher)
 
 		# enqueue teardown actions (executed in LIFO order)
-		cls.addClassCleanup(_restore_thread_locals, copy.deepcopy(frappe.local.flags))
+		cls.addClassCleanup(_restore_ctx_locals, copy.deepcopy(frappe.local.flags))
 		cls.addClassCleanup(_rollback_db)
 		cls._integration_test_case_class_setup_done = True
 
@@ -183,12 +183,13 @@ def _rollback_db():
 	frappe.db.rollback()
 
 
-def _restore_thread_locals(flags):
+def _restore_ctx_locals(flags):
 	frappe.local.flags = flags
 	frappe.local.error_log = []
 	frappe.local.message_log = []
 	frappe.local.debug_log = []
 	frappe.local.conf = frappe._dict(frappe.get_site_config())
+	frappe.local.response = frappe._dict({"docs": []})
 	frappe.local.cache = {}
 	frappe.local.lang = "en"
 	frappe.local.preload_assets = {"style": [], "script": [], "icons": []}
diff --git a/frappe/tests/test_client.py b/frappe/tests/test_client.py
index e6d0cc9552..588b9fa628 100644
--- a/frappe/tests/test_client.py
+++ b/frappe/tests/test_client.py
@@ -74,19 +74,16 @@ class TestClient(IntegrationTestCase):
 	def test_run_doc_method(self):
 		from frappe.handler import execute_cmd
 
-		if not frappe.db.exists("Report", "Test Run Doc Method"):
-			report = frappe.get_doc(
-				{
-					"doctype": "Report",
-					"ref_doctype": "User",
-					"report_name": "Test Run Doc Method",
-					"report_type": "Query Report",
-					"is_standard": "No",
-					"roles": [{"role": "System Manager"}],
-				}
-			).insert()
-		else:
-			report = frappe.get_doc("Report", "Test Run Doc Method")
+		report = frappe.get_doc(
+			{
+				"doctype": "Report",
+				"ref_doctype": "User",
+				"report_name": frappe.generate_hash(),
+				"report_type": "Query Report",
+				"is_standard": "No",
+				"roles": [{"role": "System Manager"}],
+			}
+		).insert()
 
 		frappe.local.request = frappe._dict()
 		frappe.local.request.method = "GET"