Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 15031)
+++ trunk/build.xml	(revision 15032)
@@ -56,4 +56,6 @@
         <property name="jacoco.inclnolocationclasses" value="false" />
         <property name="junit.printsummary" value="on" />
+        <property name="default-junit-includes" value="**/*Test.class"/>
+        <property name="default-junitIT-includes" value="**/*TestIT.class"/>
         <!-- build parameter: compression level (ant -Dclevel=N)
                  N ranges from 0 (no compression) to 9 (maximum compression)
@@ -502,4 +504,6 @@
         <attribute name="testITsuffix" default=""/>
         <attribute name="coverage" default="${coverageByDefault}"/>
+        <attribute name="includes" default="${default-junit@{testITsuffix}-includes}"/>
+        <attribute name="excludes" default="${default-junit@{testITsuffix}-excludes}"/>
         <sequential>
             <echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
@@ -549,5 +553,5 @@
                     <formatter type="xml"/>
                     <batchtest fork="yes" todir="${test.dir}/report">
-                        <fileset dir="${test.dir}/build/@{testfamily}" includes="**/*Test@{testITsuffix}.class"/>
+                        <fileset dir="${test.dir}/build/@{testfamily}" includes="@{includes}" excludes="@{excludes}"/>
                     </batchtest>
                 </junit>