diff --git a/build.xml b/build.xml
index 28d983c9..0a0eb8c7 100644
--- a/build.xml
+++ b/build.xml
@@ -252,6 +252,8 @@
        <pathelement location="${lib}/hamcrest-core-1.3.jar"/>
        <pathelement location="${lib}/mockito-all-1.9.5.jar"/>
        <pathelement location="${lib}/junit-platform-console-standalone-1.4.0.jar"/>
+       <pathelement location="${build}"/>
+
     </path>
 
     <target name="test.db.management.system">
@@ -335,7 +337,10 @@
 
            <formatter type="brief" usefile="false" />
            <batchtest>
-               <fileset dir="${test.build.dir}" includes="**/*TestMVUtil.java" />
+               <fileset dir="${test.build.dir}">
+                   <include name="TestMVUtil*"/>
+                   <!-- Include other JUnit tests as they are created-->
+               </fileset>
            </batchtest>
         </junit>
     </target>