diff --git a/build.xml b/build.xml
index 199fc42dc670884f384c380b7b2379f66650b912..f58a7cd3013a3784786ea8768c208216556de372 100644
--- a/build.xml
+++ b/build.xml
@@ -61,7 +61,7 @@
 
   <!-- PHPUnit -->
   <target name="phpunit" description="Run unit tests">
-    <exec dir="${srcdir}/tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" />
+    <exec dir="${srcdir}/module/VuFind/tests/unit-tests" command="VUFIND_LOCAL_DIR=${srcdir}/local phpunit -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" />
   </target>
 
   <!-- Install and Activate VuFind -->
diff --git a/tests/bootstrap.php b/module/VuFind/tests/unit-tests/bootstrap.php
similarity index 94%
rename from tests/bootstrap.php
rename to module/VuFind/tests/unit-tests/bootstrap.php
index 92d5d924987a2e62bcf50c3ca96be2060541868f..e0c28084e2c9a9395e87036b0a926971f91d07e8 100644
--- a/tests/bootstrap.php
+++ b/module/VuFind/tests/unit-tests/bootstrap.php
@@ -7,8 +7,7 @@ use Zend\Mvc\Service\ServiceManagerConfig;
 define('VUFIND_PHPUNIT_RUNNING', 1);
 
 // Define path to application directory
-defined('APPLICATION_PATH')
-    || define('APPLICATION_PATH', dirname(__DIR__));
+defined('APPLICATION_PATH') || define('APPLICATION_PATH', realpath(dirname(__DIR__) . '/../../..'));
 
 // Define application environment
 defined('APPLICATION_ENV')
diff --git a/tests/phpunit.xml b/module/VuFind/tests/unit-tests/phpunit.xml
similarity index 67%
rename from tests/phpunit.xml
rename to module/VuFind/tests/unit-tests/phpunit.xml
index 78b63f11402d8c969fa39dc0819b1077a6476521..3db2ab8d4310866a4849fcbd2d8e82afd5f58b77 100644
--- a/tests/phpunit.xml
+++ b/module/VuFind/tests/unit-tests/phpunit.xml
@@ -1,13 +1,13 @@
 <phpunit bootstrap="./bootstrap.php" backupGlobals="false">
   <testsuites>
     <testsuite name="VuFind">
-      <directory>../module/VuFind/tests</directory>
+      <directory>src</directory>
     </testsuite>
   </testsuites>
 
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../module/VuFind/src</directory>
+      <directory suffix=".php">../../src</directory>
     </whitelist>
   </filter>
 </phpunit>