diff --git a/maxscale-system-test/bug529.cpp b/maxscale-system-test/bug529.cpp
index 5f5de6d36..0607cd740 100644
--- a/maxscale-system-test/bug529.cpp
+++ b/maxscale-system-test/bug529.cpp
@@ -150,10 +150,7 @@ int main(int argc, char *argv[])
     Test->repl->connect();
 
     conn = Test->open_rwsplit_connection();
-    execute_query(conn, (char *) "DROP DATABASE IF EXISTS test");
-    execute_query(conn, (char *) "CREATE DATABASE test");
     execute_query(conn, (char *) "USE test;");
-
     create_t1(conn);
     mysql_close(conn);
     Test->tprintf("Table t1 is created\n");
diff --git a/maxscale-system-test/bug649.cpp b/maxscale-system-test/bug649.cpp
index a414a6ea7..fbb95d594 100644
--- a/maxscale-system-test/bug649.cpp
+++ b/maxscale-system-test/bug649.cpp
@@ -126,8 +126,7 @@ int main(int argc, char *argv[])
 
     /** Clean up */
     Test->repl->connect();
-    execute_query(Test->repl->nodes[0], "DROP DATABASE test");
-    execute_query(Test->repl->nodes[0], "CREATE DATABASE test");
+    execute_query(Test->repl->nodes[0], "DROP TABLE IF EXISTS t1;");
 
     int rval = Test->global_result;
     delete Test;
diff --git a/maxscale-system-test/short_sessions.cpp b/maxscale-system-test/short_sessions.cpp
index 6eb25789e..3b7df1ee5 100644
--- a/maxscale-system-test/short_sessions.cpp
+++ b/maxscale-system-test/short_sessions.cpp
@@ -24,8 +24,6 @@ int main(int argc, char *argv[])
     test.repl->connect();
 
     MYSQL *conn = test.open_rwsplit_connection();
-    execute_query(conn, "DROP DATABASE IF EXISTS test;");
-    execute_query(conn, "CREATE DATABASE test;");
     execute_query(conn, "USE test;");
     create_t1(conn);
     mysql_close(conn);