diff --git a/mysql-test/suite/parts/r/partition_debug.result b/mysql-test/suite/parts/r/partition_debug.result
index e438cae7a145e..96ed9b010b7bf 100644
--- a/mysql-test/suite/parts/r/partition_debug.result
+++ b/mysql-test/suite/parts/r/partition_debug.result
@@ -1,3 +1,4 @@
+FLUSH TABLES;
 #
 # Bug#13737949: CRASH IN HA_PARTITION::INDEX_INIT
 # Bug#18694052: SERVER CRASH IN HA_PARTITION::INIT_RECORD_PRIORITY_QUEUE
diff --git a/mysql-test/suite/parts/t/partition_debug.test b/mysql-test/suite/parts/t/partition_debug.test
index 864452f8d8b23..6d7cf3ae8b34c 100644
--- a/mysql-test/suite/parts/t/partition_debug.test
+++ b/mysql-test/suite/parts/t/partition_debug.test
@@ -8,6 +8,10 @@
 # Crash tests don't work with embedded
 --source include/not_embedded.inc
 
+# Make sure system tables are not open, as the test will kill the server
+# and it will cause corruption errors in the log
+FLUSH TABLES;
+
 # Partitioning test that require debug features
 
 --echo #