diff --git a/mysql-test/suite/s3/clone.result b/mysql-test/suite/s3/clone.result
index a33c8c4259a99..6337e681f7e2a 100644
--- a/mysql-test/suite/s3/clone.result
+++ b/mysql-test/suite/s3/clone.result
@@ -1,9 +1,7 @@
+DROP TABLE IF EXISTS t1;
 #
 # SELECT using ror_merged scan fails with s3 tables
 #
-DROP TABLE IF EXISTS t1;
-Warnings:
-Note	1051	Unknown table 'test.t1'
 CREATE TABLE t1 (a INT, b INT, KEY(a), KEY(b)) ENGINE=Aria;
 INSERT INTO t1 VALUES (0,0),(0,10),(3,10);
 ALTER TABLE t1 ENGINE=S3;
diff --git a/mysql-test/suite/s3/clone.test b/mysql-test/suite/s3/clone.test
index 5695257c404e3..e94a49c98d972 100644
--- a/mysql-test/suite/s3/clone.test
+++ b/mysql-test/suite/s3/clone.test
@@ -2,13 +2,22 @@
 --source include/have_sequence.inc
 --source include/have_innodb.inc
 
+#
+# Create unique database for running the tests
+#
+--source create_database.inc
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
 --echo #
 --echo # SELECT using ror_merged scan fails with s3 tables
 --echo #
 
-DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a INT, b INT, KEY(a), KEY(b)) ENGINE=Aria;
 INSERT INTO t1 VALUES (0,0),(0,10),(3,10);
 ALTER TABLE t1 ENGINE=S3;
 SELECT * FROM t1 WHERE a = 99 OR b = 2;
 DROP TABLE t1;
+
+--source drop_database.inc