diff --git a/server/pom.xml b/server/pom.xml
index ab43c9cb598..b39f731b4c9 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -106,16 +106,40 @@
     <testResources>
       <testResource>
         <directory>test/resources</directory>
+          <excludes>
+              <exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude>
+          </excludes>
       </testResource>
     </testResources>
     <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <executions>
+                <execution>
+                    <id>default-testCompile</id>
+                    <phase>test-compile</phase>
+                    <configuration>
+                        <testExcludes>
+                            <exclude>**/com/cloud/upgrade/*.java</exclude>
+                            <exclude>**/com/cloud/async/*.java</exclude>
+                        </testExcludes>
+                    </configuration>
+                    <goals>
+                        <goal>testCompile</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <argLine>-Xmx1024m</argLine>
           <excludes>
-            <exclude>com/cloud/upgrade/*</exclude>
+            <exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude>
+              <exclude>com/cloud/upgrade/AdvanceZone223To224UpgradeTest</exclude>
+              <exclude>com/cloud/upgrade/AdvanceZone217To224UpgradeTest</exclude>
             <exclude>com/cloud/async/*</exclude>
             <exclude>com/cloud/cluster/*</exclude>
             <exclude>com/cloud/snapshot/*</exclude>
diff --git a/server/test/com/cloud/upgrade/DbUpgrade22Test.java b/server/test/com/cloud/upgrade/DbUpgrade22Test.java
index 2718ff23b06..e0db82db0bc 100644
--- a/server/test/com/cloud/upgrade/DbUpgrade22Test.java
+++ b/server/test/com/cloud/upgrade/DbUpgrade22Test.java
@@ -16,12 +16,14 @@
 // under the License.
 package com.cloud.upgrade;
 
+import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({ AdvanceZone217To224UpgradeTest.class, AdvanceZone223To224UpgradeTest.class, PortForwarding218To224UpgradeTest.class, InstanceGroup218To224UpgradeTest.class,
         BasicZone218To224UpgradeTest.class, UsageEvents218To224UpgradeTest.class })
+@Ignore("maven-sure-fire discovered")
 public class DbUpgrade22Test {
 
 }