diff --git a/build.xml b/build.xml
index 8e69b19e2..56f09b20a 100644
--- a/build.xml
+++ b/build.xml
@@ -345,11 +345,13 @@ limitations under the License.
       <batchtest fork="${test.fork}" todir="${build.test.reports}">
         <fileset dir="${source.test}">
           <include name="**/Test*.java"/>
-          <exclude name="**/TestAll*.java"/>
+          <!-- Exclude groups of tests -->
+          <exclude name="**/TestAll.java"/>
+          <exclude name="**/TestAllPackages.java"/>
+          <!-- Exclude Asbtract classes -->
           <exclude name="**/TestAbstract*"/>
           <exclude name="**/TestArrayList.java"/>
           <exclude name="**/TestLinkedList.java"/>
-          <exclude name="**/TestHashMap.java"/>
           <exclude name="**/TestTreeMap.java"/>
           <exclude name="**/TestTypedCollection.java"/>
           <exclude name="**/TestAnyAllOnePredicate.java"/>
diff --git a/pom.xml b/pom.xml
index 2ef336992..0072b38da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,11 +399,13 @@
               </includes>
               <excludes>
                 <exclude>**/*$*</exclude>
-                <exclude >**/TestAll*.java</exclude>
+                <!-- Exclude groups of tests -->
+                <exclude >**/TestAll.java</exclude>
+                <exclude >**/TestAllPackages.java</exclude>
+                <!-- Exclude Asbtract classes -->
                 <exclude >**/TestAbstract*</exclude>
                 <exclude >**/TestArrayList.java</exclude>
                 <exclude >**/TestLinkedList.java</exclude>
-                <exclude >**/TestHashMap.java</exclude>
                 <exclude >**/TestTreeMap.java</exclude>
                 <exclude >**/TestTypedCollection.java</exclude>
                 <exclude >**/TestAnyAllOnePredicate.java</exclude>