diff --git a/test/tap/tests/test_ssl_fast_forward-1-t.cpp b/test/tap/tests/test_ssl_fast_forward-1-t.cpp
index 9cdb7dfa8..b075ef632 100644
--- a/test/tap/tests/test_ssl_fast_forward-1-t.cpp
+++ b/test/tap/tests/test_ssl_fast_forward-1-t.cpp
@@ -66,6 +66,11 @@ std::vector<std::string> queries_SQL2 = {
 	"INSERT INTO tbl1459 SELECT NULL , i1 + id, i2 + id FROM tbl1459",
 };
 
+std::vector<std::string> queries_SQL4 = {
+	"DROP TABLE IF EXISTS tbl1459",
+	"VACUUM",
+};
+
 std::vector<unsigned long long int> queries_limits = {
 	1, 10, 20, 27, 103, 169, 320, 450, 512, 619, 915, 1022,
 	1033, 1145, 1516, 1920, 2034, 5014, 9932, 10111,
@@ -255,6 +260,10 @@ int main(int argc, char** argv) {
 
 
 
+	// clean up
+	if (run_queries_sets(queries_SQL4, mysqls[0], "Running on SQLite3"))
+		return exit_status();
+
 
 	for (int i=0; i<5; i++) {
 		diag("Connection %d has thread_id: %lu", i, mysqls[i]->thread_id);
diff --git a/test/tap/tests/test_ssl_fast_forward-2-t.cpp b/test/tap/tests/test_ssl_fast_forward-2-t.cpp
index 0ed603894..dd5b0b9a3 100644
--- a/test/tap/tests/test_ssl_fast_forward-2-t.cpp
+++ b/test/tap/tests/test_ssl_fast_forward-2-t.cpp
@@ -55,6 +55,11 @@ std::vector<std::string> queries_SQL3 = {
 	"CREATE TABLE tbl1459v (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL , t1 VARCHAR)",
 };
 
+std::vector<std::string> queries_SQL4 = {
+	"DROP TABLE IF EXISTS tbl1459v",
+	"VACUUM",
+};
+
 
 int run_queries_sets(std::vector<std::string>& queries, MYSQL *my, const std::string& message_prefix) {
 	for (std::vector<std::string>::iterator it = queries.begin(); it != queries.end(); it++) {
@@ -246,6 +251,9 @@ int main(int argc, char** argv) {
 			}
 		}
 	}
+	// clean up
+	if (run_queries_sets(queries_SQL4, mysqls[0], "Running on SQLite3"))
+		return exit_status();
 
 
 	mysql_close(mysqladmin);