diff --git a/maxscale-system-test/cache_runtime.cpp b/maxscale-system-test/cache_runtime.cpp
index dc954b27c..1006ce697 100644
--- a/maxscale-system-test/cache_runtime.cpp
+++ b/maxscale-system-test/cache_runtime.cpp
@@ -209,5 +209,9 @@ int main(int argc, char* argv[])
         run(test);
     }
 
+    test.maxscales->connect();
+    drop(test);
+    test.maxscales->disconnect();
+
     return test.global_result;
 }
diff --git a/maxscale-system-test/cache_runtime_ttl.cpp b/maxscale-system-test/cache_runtime_ttl.cpp
index bf3cd16c7..d98f9efb7 100644
--- a/maxscale-system-test/cache_runtime_ttl.cpp
+++ b/maxscale-system-test/cache_runtime_ttl.cpp
@@ -190,5 +190,9 @@ int main(int argc, char* argv[])
         run(test);
     }
 
+    test.maxscales->connect();
+    drop(test);
+    test.maxscales->disconnect();
+
     return test.global_result;
 }
diff --git a/maxscale-system-test/longblob.cpp b/maxscale-system-test/longblob.cpp
index a1afa07c1..5a7726075 100644
--- a/maxscale-system-test/longblob.cpp
+++ b/maxscale-system-test/longblob.cpp
@@ -80,6 +80,10 @@ int main(int argc, char *argv[])
     Test->repl->close_connections();
     Test->maxscales->close_maxscale_connections(0);
 
+    Test->repl->connect();
+    Test->try_query(Test->repl->nodes[0], "DROP TABLE long_blob_table");
+    Test->repl->disconnect();
+
     int rval = Test->global_result;
     delete Test;
     return rval;
diff --git a/maxscale-system-test/mxs1719.cpp b/maxscale-system-test/mxs1719.cpp
index 43859ecbe..0c7fd64f2 100644
--- a/maxscale-system-test/mxs1719.cpp
+++ b/maxscale-system-test/mxs1719.cpp
@@ -100,5 +100,9 @@ int main(int argc, char* argv[])
         test.assert(false, "Could not copy masking file to MaxScale node.");
     }
 
+    test.maxscales->connect();
+    test.try_query(test.maxscales->conn_rwsplit[0], "DROP TABLE MXS_1719");
+    test.maxscales->disconnect();
+
     return test.global_result;
 }
diff --git a/maxscale-system-test/mxs173_throttle_filter.cpp b/maxscale-system-test/mxs173_throttle_filter.cpp
index 942409038..0d8548b50 100644
--- a/maxscale-system-test/mxs173_throttle_filter.cpp
+++ b/maxscale-system-test/mxs173_throttle_filter.cpp
@@ -229,5 +229,9 @@ int main(int argc, char *argv[])
         throw;
     }
 
+    test.repl->connect();
+    execute_query(test.repl->nodes[0], "DROP TABLE test.throttle");
+    test.repl->disconnect();
+
     return test.global_result;
 }
diff --git a/maxscale-system-test/mxs365.cpp b/maxscale-system-test/mxs365.cpp
index 46f4662a4..ad59f22b9 100644
--- a/maxscale-system-test/mxs365.cpp
+++ b/maxscale-system-test/mxs365.cpp
@@ -82,6 +82,11 @@ int main(int argc, char *argv[])
     test->tprintf("Cecking if Maxscale alive\n");
     test->check_maxscale_alive(0);
     int rval = test->global_result;
+
+    test->maxscales->connect();
+    execute_query(test->maxscales->conn_rwsplit[0], "DROP TABLE test.dump");
+    test->maxscales->disconnect();
+
     delete test;
     unlink(filename);
     return rval;
diff --git a/maxscale-system-test/mxs812_1.cpp b/maxscale-system-test/mxs812_1.cpp
index 99238eee3..0f65aa492 100644
--- a/maxscale-system-test/mxs812_1.cpp
+++ b/maxscale-system-test/mxs812_1.cpp
@@ -65,5 +65,9 @@ int main(int argc, char *argv[])
 
     test.maxscales->disconnect();
 
+    test.repl->connect();
+    test.try_query(test.repl->nodes[0], "DROP TABLE long_blob_table");
+    test.repl->disconnect();
+
     return test.global_result;
 }
diff --git a/maxscale-system-test/mysqlmon_switchover_stress.cpp b/maxscale-system-test/mysqlmon_switchover_stress.cpp
index 28731979b..051fe3e13 100644
--- a/maxscale-system-test/mysqlmon_switchover_stress.cpp
+++ b/maxscale-system-test/mysqlmon_switchover_stress.cpp
@@ -633,5 +633,9 @@ int main(int argc, char* argv[])
 
     run(test);
 
+    test.repl->connect();
+    execute_query(test.repl->nodes[0], "DROP TABLE test.t");
+    test.repl->disconnect();
+
     return test.global_result;
 }
diff --git a/maxscale-system-test/rwsplit_readonly.cpp b/maxscale-system-test/rwsplit_readonly.cpp
index 3c7b72617..7f107c7a6 100644
--- a/maxscale-system-test/rwsplit_readonly.cpp
+++ b/maxscale-system-test/rwsplit_readonly.cpp
@@ -273,6 +273,10 @@ int main(int argc, char *argv[])
     /** More complex tests */
     test_complex(Test);
 
+    Test->repl->connect();
+    execute_query(Test->repl->nodes[0], "DROP TABLE test.readonly");
+    Test->repl->disconnect();
+
     /** Clean up test environment */
     Test->repl->flush_hosts();
     int rval = Test->global_result;