diff --git a/server/test/com/cloud/agent/manager/SearchCriteria2Test.java b/server/test/com/cloud/agent/manager/SearchCriteria2Test.java
index dd709e5be3f..8dd4c33d907 100755
--- a/server/test/com/cloud/agent/manager/SearchCriteria2Test.java
+++ b/server/test/com/cloud/agent/manager/SearchCriteria2Test.java
@@ -30,12 +30,12 @@ public class SearchCriteria2Test extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
         MockComponentLocator locator = new MockComponentLocator("management-server");
         locator.addDao("HostDao", HostDaoImpl.class);
         locator.addDao("VmInstance", VMInstanceDaoImpl.class);
         s_logger.debug("Finding sample data from 2.1.12");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.12-newagentmanager/2.2.12_new_agent_manager_cloud_db_sample.sql", false, true);
+        DbTestUtils.executeScript("fake", false, true);
     }
     
     public void testSearch() {
diff --git a/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java b/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java
index c119d5eb07f..8208b3009ad 100644
--- a/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java
@@ -40,7 +40,7 @@ public class AdvanceZone217To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
     
     @Override
@@ -50,7 +50,7 @@ public class AdvanceZone217To224UpgradeTest extends TestCase {
     
     public void test217to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.1.7");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.7/2.1.7.sample.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
         
         Connection conn;
         PreparedStatement pstmt;
diff --git a/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java b/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java
index b96093bac2f..c410dff5e8e 100644
--- a/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java
@@ -40,7 +40,7 @@ public class BasicZone218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
     
     @Override
@@ -50,7 +50,7 @@ public class BasicZone218To224UpgradeTest extends TestCase {
     
     public void test217to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.1.8");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.8/2.1.8_sample_basicZone_SecurityGroups.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
         
         Connection conn = Transaction.getStandaloneConnection();
         PreparedStatement pstmt;
diff --git a/server/test/com/cloud/upgrade/HostCapacity218to22Test.java b/server/test/com/cloud/upgrade/HostCapacity218to22Test.java
index 6303622acf9..1ed74834096 100644
--- a/server/test/com/cloud/upgrade/HostCapacity218to22Test.java
+++ b/server/test/com/cloud/upgrade/HostCapacity218to22Test.java
@@ -18,7 +18,7 @@ public class HostCapacity218to22Test extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
     
     @Override
@@ -28,7 +28,7 @@ public class HostCapacity218to22Test extends TestCase {
 
     public void test218to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.1.8");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.8/2.1.8_sample_host_capacity.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
         
         VersionDaoImpl dao = ComponentLocator.inject(VersionDaoImpl.class);
         DatabaseUpgradeChecker checker = ComponentLocator.inject(DatabaseUpgradeChecker.class);
diff --git a/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java b/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java
index b87916bf43e..12739f9b7e8 100644
--- a/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java
@@ -41,7 +41,7 @@ public class InstanceGroup218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
     
     @Override
@@ -51,7 +51,7 @@ public class InstanceGroup218To224UpgradeTest extends TestCase {
     
     public void test217to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.1.8");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.8/2.1.8_sample_instanceGroups.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
         
         PreparedStatement pstmt;
         ResultSet rs;
diff --git a/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java b/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java
index 02863a606d8..e0725f48bb0 100644
--- a/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java
@@ -41,7 +41,7 @@ public class PortForwarding218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
     
     @Override
@@ -51,7 +51,7 @@ public class PortForwarding218To224UpgradeTest extends TestCase {
     
     public void test217to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.1.8");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.8/2.1.8_sample_portForwarding.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
         
         Connection conn;
         PreparedStatement pstmt;
diff --git a/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java
index 2951702754b..a6ed9180fcf 100644
--- a/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java
@@ -39,7 +39,7 @@ public class Sanity220To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
 
     @Override
@@ -49,7 +49,7 @@ public class Sanity220To224UpgradeTest extends TestCase {
 
     public void test217to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.2.1");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.0/2.2.0.sample.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
 
         Connection conn;
         PreparedStatement pstmt;
diff --git a/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java
index 8600a7f1b00..18eae81d95f 100644
--- a/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java
@@ -39,7 +39,7 @@ public class Sanity222To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
 
     @Override
@@ -49,7 +49,7 @@ public class Sanity222To224UpgradeTest extends TestCase {
 
     public void test222to224Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.2.2");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.2/2.2.2_cloud_db_sample.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
 
         Connection conn;
         PreparedStatement pstmt;
diff --git a/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java
index 1977929620e..52edafc5a2a 100644
--- a/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java
@@ -39,7 +39,7 @@ public class Sanity224To225UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
 
     @Override
@@ -49,7 +49,7 @@ public class Sanity224To225UpgradeTest extends TestCase {
 
     public void test224to225Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.2.4");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.4/2.2.4_cloud_db_sample.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
 
         Connection conn;
         PreparedStatement pstmt;
diff --git a/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java b/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java
index 9759dfbf5e8..2cfbd1cc0ed 100644
--- a/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java
@@ -42,7 +42,7 @@ public class Template2214To30UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false,
+        DbTestUtils.executeScript("fake.sql", false,
                 true);
     }
 
@@ -54,7 +54,7 @@ public class Template2214To30UpgradeTest extends TestCase {
     public void test2214to30Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.2.14");
         DbTestUtils.executeScript(
-                "PreviousDatabaseSchema/2.2.14/template_upgrade.sql", false,
+                "fake.sql", false,
                 true);
 
         DatabaseUpgradeChecker checker = ComponentLocator
diff --git a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java
index 31011ab71d7..20a3bfb741e 100644
--- a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java
+++ b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java
@@ -42,7 +42,7 @@ public class Test2214To30DBUpgrade extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false,
+        DbTestUtils.executeScript("fake.sql", false,
                 true);
     }
 
@@ -54,7 +54,7 @@ public class Test2214To30DBUpgrade extends TestCase {
     public void test2214to30Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.2.14");
         DbTestUtils.executeScript(
-                "PreviousDatabaseSchema/2.2.14/alena_2214_guestNetwork_advanceZone.sql", false,
+                "fake.sql", false,
                 true);
 
         DatabaseUpgradeChecker checker = ComponentLocator
diff --git a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java
index 3886c67b9dc..f611407771a 100644
--- a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java
@@ -41,8 +41,8 @@ public class Usage217To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
-        DbTestUtils.executeUsageScript("PreviousDatabaseSchema/clean-usage-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
+        DbTestUtils.executeUsageScript("fake.sql", false, true);
     }
     
     @Override
@@ -52,8 +52,8 @@ public class Usage217To224UpgradeTest extends TestCase {
     
     public void test21to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.1.7");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.7/2.1.tata.sql", false, true);
-        DbTestUtils.executeUsageScript("PreviousDatabaseSchema/2.1.7/2.1.usage.tata.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
+        DbTestUtils.executeUsageScript("fake.sql", false, true);
         
         Connection conn;
         PreparedStatement pstmt;
diff --git a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java
index 7f72559d5d8..c70a160833e 100644
--- a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java
@@ -40,7 +40,7 @@ public class UsageEvents218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("PreviousDatabaseSchema/clean-db.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
     }
     
     @Override
@@ -50,7 +50,7 @@ public class UsageEvents218To224UpgradeTest extends TestCase {
     
     public void test21to22Upgrade() throws SQLException {
         s_logger.debug("Finding sample data from 2.1.8");
-        DbTestUtils.executeScript("PreviousDatabaseSchema/2.1.8/2.1.8.sample_usageEvents.sql", false, true);
+        DbTestUtils.executeScript("fake.sql", false, true);
         
         Connection conn;
         PreparedStatement pstmt;
diff --git a/server/test/fake.sql b/server/test/fake.sql
new file mode 100644
index 00000000000..e69de29bb2d