diff --git a/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java b/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java
index 5780e893daf..a9a84d93eba 100644
--- a/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class AdvanceZone217To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java b/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java
index 6fadb5b32ec..cd3b8e42854 100644
--- a/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class BasicZone218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/HostCapacity218to22Test.java b/server/test/com/cloud/upgrade/HostCapacity218to22Test.java
index 0fc59a5393f..648e61e6e54 100644
--- a/server/test/com/cloud/upgrade/HostCapacity218to22Test.java
+++ b/server/test/com/cloud/upgrade/HostCapacity218to22Test.java
@@ -30,7 +30,7 @@ public class HostCapacity218to22Test extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java b/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java
index c872436e84f..125da2755f3 100644
--- a/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java
@@ -36,7 +36,7 @@ public class InstanceGroup218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java b/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java
index 7df94a27ef9..2659381c326 100644
--- a/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class PortForwarding218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java
index 7b6fb9a22ef..73f3dbf612f 100644
--- a/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java
@@ -34,7 +34,7 @@ public class Sanity220To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java
index 9754f642899..15dbb6c51cb 100644
--- a/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java
@@ -34,7 +34,7 @@ public class Sanity222To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java
index 0d805777734..ff58ba3c935 100644
--- a/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java
@@ -34,7 +34,7 @@ public class Sanity224To225UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java b/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java
index 4993b290024..2945f832bdf 100644
--- a/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java
@@ -37,8 +37,7 @@ public class Template2214To30UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false,
-                true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java
index 8351d2c09c7..7fc2ab62fa3 100644
--- a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java
+++ b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java
@@ -37,8 +37,7 @@ public class Test2214To30DBUpgrade extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false,
-                true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java
index 1067c1b7786..aa96d4bde27 100644
--- a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java
@@ -35,8 +35,8 @@ public class Usage217To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
-        DbTestUtils.executeUsageScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeUsageScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java
index 0805f75fcf9..73bd5827cd2 100644
--- a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class UsageEvents218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override