diff --git a/src/inttest/resources/sql/cleanGameData.sql b/src/inttest/resources/sql/cleanGameData.sql
index a120e3363..fa1efd254 100644
--- a/src/inttest/resources/sql/cleanGameData.sql
+++ b/src/inttest/resources/sql/cleanGameData.sql
@@ -1,2 +1,8 @@
-DELETE FROM game_stats;
-DELETE FROM game_featuredMods;
+DELETE
+FROM matchmaker_queue_map_pool;
+DELETE
+FROM matchmaker_queue;
+DELETE
+FROM game_stats;
+DELETE
+FROM game_featuredMods;
diff --git a/src/inttest/resources/sql/cleanMapVersion.sql b/src/inttest/resources/sql/cleanMapVersion.sql
index 4eaf3ef5b..b95a67729 100644
--- a/src/inttest/resources/sql/cleanMapVersion.sql
+++ b/src/inttest/resources/sql/cleanMapVersion.sql
@@ -1,2 +1,12 @@
-DELETE FROM map_version;
-DELETE FROM map;
+DELETE
+FROM map_version_reviews_summary;
+DELETE
+FROM map_version_review;
+DELETE
+FROM map_reviews_summary;
+DELETE
+FROM map_pool_map_version;
+DELETE
+FROM map_version;
+DELETE
+FROM map;
diff --git a/src/inttest/resources/sql/prepGameData.sql b/src/inttest/resources/sql/prepGameData.sql
index 3d6dbee40..9d9066154 100644
--- a/src/inttest/resources/sql/prepGameData.sql
+++ b/src/inttest/resources/sql/prepGameData.sql
@@ -1,12 +1,20 @@
-DELETE FROM game_stats;
-DELETE FROM game_featuredMods;
+DELETE
+FROM matchmaker_queue_map_pool;
+DELETE
+FROM matchmaker_queue;
+DELETE
+FROM game_stats;
+DELETE
+FROM game_featuredMods;
 
-INSERT INTO game_featuredMods (id, gamemod, name, description, publish, git_url, git_branch, file_extension, allow_override)
-VALUES
-  (1, 'faf', 'FAF', 'Forged Alliance Forever', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2', FALSE),
-  (6, 'ladder1v1', 'FAF', 'Ladder games', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2', TRUE),
-  (25, 'coop', 'Coop', 'Multiplayer campaign games', 1, 'https://github.com/FAForever/fa-coop.git', 'master', 'cop',
-   TRUE);
+INSERT INTO game_featuredMods (id, gamemod, name, description, publish, git_url, git_branch, file_extension,
+                               allow_override)
+VALUES (1, 'faf', 'FAF', 'Forged Alliance Forever', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2',
+        FALSE),
+       (6, 'ladder1v1', 'FAF', 'Ladder games', 1, 'https://github.com/FAForever/fa.git', 'deploy/faf', 'nx2', TRUE),
+       (25, 'coop', 'Coop', 'Multiplayer campaign games', 1, 'https://github.com/FAForever/fa-coop.git', 'master',
+        'cop',
+        TRUE);
 
 INSERT INTO game_stats (id, startTime, gameName, gameType, gameMod, `host`, mapId, validity) VALUES
   (1, NOW(), 'Test game', '0', 6, 1, 1, 0);
diff --git a/src/inttest/resources/sql/prepMapVersion.sql b/src/inttest/resources/sql/prepMapVersion.sql
index 584422771..1f7e2132c 100644
--- a/src/inttest/resources/sql/prepMapVersion.sql
+++ b/src/inttest/resources/sql/prepMapVersion.sql
@@ -1,6 +1,17 @@
-DELETE FROM map_version;
-DELETE FROM map;
+DELETE
+FROM map_version_reviews_summary;
+DELETE
+FROM map_version_review;
+DELETE
+FROM map_reviews_summary;
+DELETE
+FROM map_pool_map_version;
+DELETE
+FROM map_version;
+DELETE
+FROM map;
 
-INSERT INTO map (id, display_name, map_type, battle_type, author) VALUES (1, 'display name', 'mtype', 'btype', 1);
+INSERT INTO map (id, display_name, map_type, battle_type, author)
+VALUES (1, 'display name', 'mtype', 'btype', 1);
 INSERT INTO map_version (id, description, max_players, width, height, version, filename, map_id, hidden, ranked)
 VALUES (1, 'des', 2, 2, 2, 1, 'map/ghb.zip', 1, 0, 1);