diff --git a/mysql-test/r/rpl_ndb_dd_partitions.result b/mysql-test/r/rpl_ndb_dd_partitions.result
index 1be1eae7602..ece6b84c227 100644
--- a/mysql-test/r/rpl_ndb_dd_partitions.result
+++ b/mysql-test/r/rpl_ndb_dd_partitions.result
@@ -716,3 +716,11 @@ DELETE FROM t1;
 --- End test 5 key partition testing ---
 --- Do Cleanup ---
 DROP TABLE IF EXISTS t1;
+alter tablespace ts1
+drop datafile 'datafile.dat'
+engine=ndb;
+alter tablespace ts1
+drop datafile 'datafile02.dat'
+engine=ndb;
+DROP TABLESPACE ts1 ENGINE=NDB;
+DROP LOGFILE GROUP lg1 ENGINE=NDB;
diff --git a/mysql-test/t/rpl_ndb_dd_partitions.test b/mysql-test/t/rpl_ndb_dd_partitions.test
index 026c31bbdc7..9291f38e8db 100644
--- a/mysql-test/t/rpl_ndb_dd_partitions.test
+++ b/mysql-test/t/rpl_ndb_dd_partitions.test
@@ -297,5 +297,14 @@ SHOW CREATE TABLE t1;
 --echo --- Do Cleanup ---
 
 DROP TABLE IF EXISTS t1;
+alter tablespace ts1
+drop datafile 'datafile.dat'
+engine=ndb;
+alter tablespace ts1
+drop datafile 'datafile02.dat'
+engine=ndb;
+DROP TABLESPACE ts1 ENGINE=NDB;
+DROP LOGFILE GROUP lg1 ENGINE=NDB;
+--sync_slave_with_master
 
 # End of 5.1 test case