diff --git a/build.xml b/build.xml
index afb3743690e91204371093ab757aad78d123074e..c1ec6d5dfd01650b2839cd717a2355596782e869 100644
--- a/build.xml
+++ b/build.xml
@@ -15,7 +15,7 @@ string="original,mutant-1,mutant-2,mutant-3,mutant-4,mutant-5" substring="${prog
 
     <target name="check_test">
         <fail message="Please provide a test with -Dtest=''. The arguments can be one of 
-{boundary, partitioning}">
+{Boundary, Partitioning}">
             <condition>
                 <or>
                     <not><isset property="test"/></not>
@@ -42,10 +42,10 @@ classpath="lib/junit-4.11.jar;lib/hamcrest-core-1.3.jar" includeantruntime="fals
     </target>
 
     <target name="compile_test" depends="compile_orig, check_test">
-        <mkdir dir="classes/tests/${test}"/>
-        <depend srcdir="tests/${test}" destdir="classes/tests/${test}" 
-cache=".depcache/tests/${test}" closure="yes"/>
-        <javac srcdir="tests/${test}" destdir="classes/tests/${test}" 
+        <mkdir dir="classes/tests" />
+        <depend srcdir="tests/" destdir="classes/tests/" 
+cache=".depcache/tests/" closure="yes"/>
+        <javac srcdir="tests/" destdir="classes/tests/" 
 classpath="lib/junit-4.11.jar;lib/hamcrest-core-1.3.jar;classes/programs/original" 
 includeantruntime="false"/>
     </target>
@@ -57,7 +57,7 @@ includeantruntime="false"/>
                 <junit printsummary="yes" fork="yes" haltonfailure="yes">
                     <classpath>
                         <pathelement path="classes/programs/${program}"/>
-                        <pathelement path="classes/tests/${test}"/>
+                        <pathelement path="classes/tests/"/>
                         <pathelement path="lib/junit-4.11.jar"/>
                         <pathelement path="lib/hamcrest-core-1.3.jar"/>
                     </classpath>
diff --git a/tests/swen90006/passbook/BoundaryTests.java b/tests/Boundary/swen90006/passbook/BoundaryTests.java
similarity index 100%
rename from tests/swen90006/passbook/BoundaryTests.java
rename to tests/Boundary/swen90006/passbook/BoundaryTests.java
diff --git a/tests/swen90006/passbook/PartitioningTests.java b/tests/Partitioning/swen90006/passbook/PartitioningTests.java
similarity index 100%
rename from tests/swen90006/passbook/PartitioningTests.java
rename to tests/Partitioning/swen90006/passbook/PartitioningTests.java