diff --git a/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp
index e46e2d3f9..51c68ade7 100644
--- a/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp
+++ b/test/tap/tests_with_deps/deprecate_eof_support/deprecate_eof_cache-t.cpp
@@ -1,11 +1,8 @@
-#include <algorithm>
 #include <unistd.h>
 #include <vector>
 #include <string>
 #include <stdio.h>
 #include <stdlib.h>
-#include <iostream>
-#include <random>
 
 #include "mysql.h"
 #include "mysqld_error.h"
diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp
index 3a50ce1d8..82b5cf14d 100644
--- a/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp
+++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_fast_forward-t.cpp
@@ -18,7 +18,6 @@
 #include <stdio.h>
 
 #include "mysql.h"
-#include "mysqld_error.h"
 
 #include "proxysql_utils.h"
 
@@ -57,7 +56,6 @@ int create_testing_tables(MYSQL* mysql_server) {
 
 int perform_workload_on_connection(MYSQL* proxy, MYSQL* admin) {
 	// Change default query rules to avoid replication issues
-//	MYSQL_QUERY(admin, "UPDATE mysql_query_rules SET destination_hostgroup=0 WHERE rule_id=2");
 	MYSQL_QUERY(admin, "UPDATE mysql_query_rules SET active=0");
 	MYSQL_QUERY(admin, "LOAD MYSQL QUERY RULES TO RUNTIME");
 
@@ -175,7 +173,6 @@ int perform_workload_on_connection(MYSQL* proxy, MYSQL* admin) {
 	ok(ops_err_msg.empty() == true, "Operations should complete successfully - '%s'", ops_err_msg.c_str());
 
 	// Recover default query rules
-//	MYSQL_QUERY(admin, "UPDATE mysql_query_rules SET destination_hostgroup=0 WHERE rule_id=2");
 	MYSQL_QUERY(admin, "UPDATE mysql_query_rules SET active=1");
 	MYSQL_QUERY(admin, "LOAD MYSQL QUERY RULES TO RUNTIME");