diff --git a/.travis.yml b/.travis.yml
index e44b1ed58e9..3ab5e9a1f80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ cache:
   - $HOME/.m2
 
 after_failure:
-   - tar -cjf junit-data-4.x.x.tar.bz2 target/junit-reports/data
+   - tar -cjf junit-data-4.x.x.tar.bz2 exist-core/target/junit-reports/data
    - curl -v -u $CHUNK_USER:$CHUNK_PW -sT junit-data-4.x.x.tar.bz2 chunk.io
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index ea042c1460d..2d5b5936f22 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,9 +26,9 @@ test_script:
 after_test:
   - ps: |
       $wc = New-Object 'System.Net.WebClient'
-      foreach ($file in Get-ChildItem -Path "$($env:APPVEYOR_BUILD_FOLDER)\target\junit-reports\data\" -Filter *.xml) {
+      foreach ($file in Get-ChildItem -Path "$($env:APPVEYOR_BUILD_FOLDER)\exist-core\target\junit-reports\data\" -Filter *.xml) {
         $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", $file.FullName)
       }
 
 artifacts:
-  - path: target\junit-reports
+  - path: exist-core\target\junit-reports
diff --git a/build/scripts/build-impl.xml b/build/scripts/build-impl.xml
index 1677797d401..5831bd76998 100644
--- a/build/scripts/build-impl.xml
+++ b/build/scripts/build-impl.xml
@@ -256,6 +256,7 @@
                source="${build.compiler.source}" target="${build.compiler.target}"
                fork="true" memoryInitialSize="512m" memoryMaximumSize="1024m">
 
+            <include name="org/exist/ant/**"/>
             <include name="org/exist/test/**"/>
             <include name="org/exist/TestUtils.java"/>
             <include name="xquery/TestRunner.java"/>
@@ -266,12 +267,13 @@
                 <fileset dir="${lib.core}">
                     <include name="*.jar"/>
                 </fileset>
+                <path refid="classpath.external"/>
                 <path refid="classpath.jetty"/>
                 <path refid="classpath.test-libs"/>
             </classpath>
         </javac>
 
-        <copy todir="${module.exist-testkit}/${build.test.classes}/org/exist/test/runner">
+        <copy todir="${module.exist-testkit}/${build.classes}/org/exist/test/runner">
             <fileset dir="${module.exist-testkit}/${resources.main}/org/exist/test/runner">
                 <include name="*.xq"/>
             </fileset>
@@ -549,13 +551,12 @@
                 <attribute name="Description" value="eXist XML Native Database Test Kit"/>
                 <attribute name="Created-By" value="${ant.version}"/>
             </manifest>
-            <fileset dir="${module.exist-testkit}/${build.test.classes}">
+            <fileset dir="${module.exist-testkit}/${build.classes}">
+                <include name="org/exist/ant/**"/>
                 <include name="org/exist/TestUtils.class"/>
                 <include name="org/exist/test/**"/>
                 <include name="xquery/TestRunner.class"/>
                 <include name="xquery/TestRunnerMain.class"/>
-            </fileset>
-            <fileset dir="${module.exist-testkit}/${build.classes}">
                 <include name="org/exist/xquery/lib/xqsuite/xqsuite.xql"/>
             </fileset>
         </jar>
diff --git a/build/scripts/extensions-common.xml b/build/scripts/extensions-common.xml
index 4c0b157977d..2208ea3e3ae 100644
--- a/build/scripts/extensions-common.xml
+++ b/build/scripts/extensions-common.xml
@@ -56,7 +56,7 @@ to add: -pre-compile steps
    <property name="dist.extension.jar" value="${dist.dir}/exist-${extension.name}-${project.version}.jar"/>
    <property name="dist.webfragment.jar" value="${existhome.dir}/webapp/WEB-INF/lib/metainf-${extension.name}.jar"/>
 
-   <property name="junit.report.dir" value="${existhome.dir}/target/junit-reports/data"/>
+   <property name="junit.report.dir" value="${existhome.dir}/exist-core/target/junit-reports/data"/>
 
    <property name="extension.include" value="yes"/>
 
diff --git a/build/scripts/junit.xml b/build/scripts/junit.xml
index cfaee309a80..1ba0f814ad8 100644
--- a/build/scripts/junit.xml
+++ b/build/scripts/junit.xml
@@ -12,7 +12,7 @@
     <import file="../../build.xml"/>
 
     <path id="classpath.junit">
-        <pathelement path="${build.test.classes}"/>
+        <pathelement path="${module.exist-core}/${build.test.classes}"/>
     </path>
 
      <path id="classpath.test-libs">
diff --git a/exist-core/src/test/java/org/exist/xmldb/BinaryResourceUpdateTest.java b/exist-core/src/test/java/org/exist/xmldb/BinaryResourceUpdateTest.java
index 3e984a857b1..6af527181d9 100644
--- a/exist-core/src/test/java/org/exist/xmldb/BinaryResourceUpdateTest.java
+++ b/exist-core/src/test/java/org/exist/xmldb/BinaryResourceUpdateTest.java
@@ -51,8 +51,8 @@ public class BinaryResourceUpdateTest  {
 
     private static final int REPEAT = 10;
 
-    private final URL binFile = getClass().getResource("test.bin");
-    private final URL xmlFile = getClass().getResource("/samples/examples.xml");
+    private URL binFile;
+    private URL xmlFile;
 
     @Test
     public void updateBinary() throws XMLDBException, URISyntaxException {
@@ -100,6 +100,10 @@ public void setUp() throws Exception {
         final CollectionManagementService service = (CollectionManagementService) existEmbeddedServer.getRoot().getService("CollectionManagementService", "1.0");
         testCollection = service.createCollection(TEST_COLLECTION);
         assertNotNull(testCollection);
+        binFile = getClass().getClassLoader().getResource("org/exist/xmldb/test.bin");
+        assertNotNull(binFile);
+        xmlFile = getClass().getClassLoader().getResource("org/exist/xmldb/test.xml");
+        assertNotNull(xmlFile);
     }
 
     @After
@@ -107,5 +111,7 @@ public void tearDown() throws XMLDBException {
         //delete the test collection
         final CollectionManagementService service = (CollectionManagementService)testCollection.getParentCollection().getService("CollectionManagementService", "1.0");
         service.removeCollection(TEST_COLLECTION);
+        binFile = null;
+        xmlFile = null;
     }
 }
\ No newline at end of file
diff --git a/exist-core/src/test/java/xquery/CoreTests.java b/exist-core/src/test/java/xquery/CoreTests.java
index 732ae4cda13..136b0089827 100644
--- a/exist-core/src/test/java/xquery/CoreTests.java
+++ b/exist-core/src/test/java/xquery/CoreTests.java
@@ -26,7 +26,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery"
+    "exist-core/src/test/xquery"
 })
 public class CoreTests {
 }
diff --git a/exist-core/src/test/java/xquery/arrays/ArrayTests.java b/exist-core/src/test/java/xquery/arrays/ArrayTests.java
index 1ff70527db5..38a986d19a8 100644
--- a/exist-core/src/test/java/xquery/arrays/ArrayTests.java
+++ b/exist-core/src/test/java/xquery/arrays/ArrayTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/arrays"
+    "exist-core/src/test/xquery/arrays"
 })
 public class ArrayTests {
 }
diff --git a/exist-core/src/test/java/xquery/dates/DateTests.java b/exist-core/src/test/java/xquery/dates/DateTests.java
index dc6fa606663..c0ebe78b245 100644
--- a/exist-core/src/test/java/xquery/dates/DateTests.java
+++ b/exist-core/src/test/java/xquery/dates/DateTests.java
@@ -27,7 +27,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/dates"
+    "exist-core/src/test/xquery/dates"
 })
 public class DateTests {
 }
diff --git a/exist-core/src/test/java/xquery/expathrepo/ExpathRepoTests.java b/exist-core/src/test/java/xquery/expathrepo/ExpathRepoTests.java
index b5db208cde7..7e8be546ee3 100644
--- a/exist-core/src/test/java/xquery/expathrepo/ExpathRepoTests.java
+++ b/exist-core/src/test/java/xquery/expathrepo/ExpathRepoTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-        "src/test/xquery/expathrepo"
+        "exist-core/src/test/xquery/expathrepo"
 })
 public class ExpathRepoTests {
 }
diff --git a/exist-core/src/test/java/xquery/indexing/IndexingTests.java b/exist-core/src/test/java/xquery/indexing/IndexingTests.java
index 71bfc291bfb..77d816942ae 100644
--- a/exist-core/src/test/java/xquery/indexing/IndexingTests.java
+++ b/exist-core/src/test/java/xquery/indexing/IndexingTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-        "src/test/xquery/indexing"
+        "exist-core/src/test/xquery/indexing"
 })
 public class IndexingTests {
 }
diff --git a/exist-core/src/test/java/xquery/inspect/InspectTests.java b/exist-core/src/test/java/xquery/inspect/InspectTests.java
index fba5860b510..f6277d2bba5 100644
--- a/exist-core/src/test/java/xquery/inspect/InspectTests.java
+++ b/exist-core/src/test/java/xquery/inspect/InspectTests.java
@@ -25,7 +25,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/inspect"
+    "exist-core/src/test/xquery/inspect"
 })
 public class InspectTests {
 }
diff --git a/exist-core/src/test/java/xquery/logicalOp/LogicalOpTests.java b/exist-core/src/test/java/xquery/logicalOp/LogicalOpTests.java
index b0eeae89d37..a1a2e205094 100644
--- a/exist-core/src/test/java/xquery/logicalOp/LogicalOpTests.java
+++ b/exist-core/src/test/java/xquery/logicalOp/LogicalOpTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/logicalOp"
+    "exist-core/src/test/xquery/logicalOp"
 })
 public class LogicalOpTests {
 }
diff --git a/exist-core/src/test/java/xquery/maps/MapTests.java b/exist-core/src/test/java/xquery/maps/MapTests.java
index d7899e7e1ea..fb5b273a721 100644
--- a/exist-core/src/test/java/xquery/maps/MapTests.java
+++ b/exist-core/src/test/java/xquery/maps/MapTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/maps"
+    "exist-core/src/test/xquery/maps"
 })
 public class MapTests {
 }
diff --git a/exist-core/src/test/java/xquery/modules/cache/CacheTests.java b/exist-core/src/test/java/xquery/modules/cache/CacheTests.java
index 3d2f66e467d..7c8750b6376 100644
--- a/exist-core/src/test/java/xquery/modules/cache/CacheTests.java
+++ b/exist-core/src/test/java/xquery/modules/cache/CacheTests.java
@@ -25,7 +25,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/modules/cache"
+    "exist-core/src/test/xquery/modules/cache"
 })
 public class CacheTests {
 }
diff --git a/exist-core/src/test/java/xquery/modules/compression/CompressionTests.java b/exist-core/src/test/java/xquery/modules/compression/CompressionTests.java
index 1e4b0e5c9ff..85b51628aad 100644
--- a/exist-core/src/test/java/xquery/modules/compression/CompressionTests.java
+++ b/exist-core/src/test/java/xquery/modules/compression/CompressionTests.java
@@ -26,7 +26,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/modules/compression"
+    "exist-core/src/test/xquery/modules/compression"
 })
 public class CompressionTests  {
 }
diff --git a/exist-core/src/test/java/xquery/modules/file/FileTests.java b/exist-core/src/test/java/xquery/modules/file/FileTests.java
index e21ed7b26e9..69a8163f9ad 100644
--- a/exist-core/src/test/java/xquery/modules/file/FileTests.java
+++ b/exist-core/src/test/java/xquery/modules/file/FileTests.java
@@ -25,7 +25,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/modules/file"
+    "exist-core/src/test/xquery/modules/file"
 })
 public class FileTests {
 }
diff --git a/exist-core/src/test/java/xquery/numbers/NumberTests.java b/exist-core/src/test/java/xquery/numbers/NumberTests.java
index 71d2a3cb708..2a9bfab76c7 100644
--- a/exist-core/src/test/java/xquery/numbers/NumberTests.java
+++ b/exist-core/src/test/java/xquery/numbers/NumberTests.java
@@ -26,7 +26,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/numbers"
+    "exist-core/src/test/xquery/numbers"
 })
 public class NumberTests {
 }
diff --git a/exist-core/src/test/java/xquery/optimizer/OptimizerTests.java b/exist-core/src/test/java/xquery/optimizer/OptimizerTests.java
index cdcd1ad7df4..54eb16d1f90 100644
--- a/exist-core/src/test/java/xquery/optimizer/OptimizerTests.java
+++ b/exist-core/src/test/java/xquery/optimizer/OptimizerTests.java
@@ -8,7 +8,7 @@
  */
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/optimizer"
+    "exist-core/src/test/xquery/optimizer"
 })
 public class OptimizerTests {
 }
diff --git a/exist-core/src/test/java/xquery/util/UtilTests.java b/exist-core/src/test/java/xquery/util/UtilTests.java
index 207ab4211a1..ced53cdce46 100644
--- a/exist-core/src/test/java/xquery/util/UtilTests.java
+++ b/exist-core/src/test/java/xquery/util/UtilTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-        "src/test/xquery/util"
+        "exist-core/src/test/xquery/util"
 })
 public class UtilTests {
 }
diff --git a/exist-core/src/test/java/xquery/xinclude/XIncludeTests.java b/exist-core/src/test/java/xquery/xinclude/XIncludeTests.java
index b226e5a075e..d87b825e0e8 100644
--- a/exist-core/src/test/java/xquery/xinclude/XIncludeTests.java
+++ b/exist-core/src/test/java/xquery/xinclude/XIncludeTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/xinclude"
+    "exist-core/src/test/xquery/xinclude"
 })
 public class XIncludeTests {
 }
\ No newline at end of file
diff --git a/exist-core/src/test/java/xquery/xmlcalabash/XMLCalabashTests.java b/exist-core/src/test/java/xquery/xmlcalabash/XMLCalabashTests.java
index f32e315deeb..ebf6042fad0 100644
--- a/exist-core/src/test/java/xquery/xmlcalabash/XMLCalabashTests.java
+++ b/exist-core/src/test/java/xquery/xmlcalabash/XMLCalabashTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/xmlcalabash"
+    "exist-core/src/test/xquery/xmlcalabash"
 })
 public class XMLCalabashTests {
 }
diff --git a/exist-core/src/test/java/xquery/xmldb/XMLDBTests.java b/exist-core/src/test/java/xquery/xmldb/XMLDBTests.java
index d9745e2ce5d..67dde7c68bc 100644
--- a/exist-core/src/test/java/xquery/xmldb/XMLDBTests.java
+++ b/exist-core/src/test/java/xquery/xmldb/XMLDBTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-        "src/test/xquery/xmldb"
+        "exist-core/src/test/xquery/xmldb"
 })
 public class XMLDBTests {
 }
diff --git a/exist-core/src/test/java/xquery/xproc/XProcTests.java b/exist-core/src/test/java/xquery/xproc/XProcTests.java
index dac7ce026b0..43f9e0e051b 100644
--- a/exist-core/src/test/java/xquery/xproc/XProcTests.java
+++ b/exist-core/src/test/java/xquery/xproc/XProcTests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-    "src/test/xquery/xproc"
+    "exist-core/src/test/xquery/xproc"
 })
 public class XProcTests {
 }
diff --git a/exist-core/src/test/java/xquery/xqsuite/XQSuiteTests.java b/exist-core/src/test/java/xquery/xqsuite/XQSuiteTests.java
index 31c6266829d..00473a9c345 100644
--- a/exist-core/src/test/java/xquery/xqsuite/XQSuiteTests.java
+++ b/exist-core/src/test/java/xquery/xqsuite/XQSuiteTests.java
@@ -25,7 +25,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-        "src/test/xquery/xqsuite"
+        "exist-core/src/test/xquery/xqsuite"
 })
 public class XQSuiteTests {
 }
diff --git a/exist-core/src/test/java/xquery/xquery3/XQuery3Tests.java b/exist-core/src/test/java/xquery/xquery3/XQuery3Tests.java
index 34b8db83a49..cb8219c58e6 100644
--- a/exist-core/src/test/java/xquery/xquery3/XQuery3Tests.java
+++ b/exist-core/src/test/java/xquery/xquery3/XQuery3Tests.java
@@ -5,7 +5,7 @@
 
 @RunWith(XSuite.class)
 @XSuite.XSuiteFiles({
-        "src/test/xquery/xquery3"
+        "exist-core/src/test/xquery/xquery3"
 })
 public class XQuery3Tests {
 }
diff --git a/exist-core/src/test/resources/ant/exist.properties b/exist-core/src/test/resources/ant/exist.properties
index 078d5c9c65b..50003187f6c 100644
--- a/exist-core/src/test/resources/ant/exist.properties
+++ b/exist-core/src/test/resources/ant/exist.properties
@@ -1,8 +1,8 @@
 exist.user=admin
 exist.password=
-exist.dir=../../../..
+exist.dir=../../../../..
 exist.uri=xmldb:exist://
 test.coll=${exist.uri}/db
 test.file=test.xml
 test.binary.file=binary.gif
-test.backup-dir=./test/temp/backup
\ No newline at end of file
+test.backup-dir=../test/temp/backup
\ No newline at end of file
diff --git a/exist-core/src/test/resources/org/exist/xmldb/test.xml b/exist-core/src/test/resources/org/exist/xmldb/test.xml
new file mode 100644
index 00000000000..52e0a2001de
--- /dev/null
+++ b/exist-core/src/test/resources/org/exist/xmldb/test.xml
@@ -0,0 +1 @@
+<test/>
\ No newline at end of file
diff --git a/exist-testkit/src/main/java/org/exist/ant/AntUnitTestRunner.java b/exist-testkit/src/main/java/org/exist/ant/AntUnitTestRunner.java
index 045822eb889..d39a568cbf4 100644
--- a/exist-testkit/src/main/java/org/exist/ant/AntUnitTestRunner.java
+++ b/exist-testkit/src/main/java/org/exist/ant/AntUnitTestRunner.java
@@ -43,7 +43,7 @@ public class AntUnitTestRunner {
 
     @Test
     public void testAntUnit() throws BuildException {
-        final Path buildFile = Paths.get("src/test/resources/ant/build.xml");
+        final Path buildFile = Paths.get("exist-core/src/test/resources/ant/build.xml");
         final Project p = new  Project();
         p.setUserProperty("ant.file", buildFile.toAbsolutePath().toString());
         final DefaultLogger consoleLogger = new DefaultLogger();