diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index f62a57d1790..71f3766c8b4 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -91,6 +91,9 @@
             <excludes>
               <exclude>${unittest.include}</exclude>
               <exclude>**/*$*</exclude>
+              <!--Do this to prevent OOME because permgen is full seen on build.apache.org
+               -->
+              <argLine> -XX:+CMSClassUnloadingEnabled </argLine>
               <!--<exclude>${test.exclude.pattern}</exclude>-->
             </excludes>
             <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
index b2f74eadad3..003a51fae69 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestAcidGuarantees.java
@@ -94,17 +94,17 @@ public class IntegrationTestAcidGuarantees extends IntegrationTestBase {
 
   @Test
   public void testGetAtomicity() throws Exception {
-    tag.runTestAtomicity(20000, 5, 5, 0, 3);
+    tag.runTestAtomicity(20000, 4, 4, 0, 3);
   }
 
   @Test
   public void testScanAtomicity() throws Exception {
-    tag.runTestAtomicity(20000, 5, 0, 5, 3);
+    tag.runTestAtomicity(20000, 3, 0, 2, 3);
   }
 
   @Test
   public void testMixedAtomicity() throws Exception {
-    tag.runTestAtomicity(20000, 5, 2, 2, 3);
+    tag.runTestAtomicity(20000, 4, 2, 2, 3);
   }
 
 
@@ -117,5 +117,3 @@ public class IntegrationTestAcidGuarantees extends IntegrationTestBase {
     System.exit(ret);
   }
 }
-
-