diff --git a/module/VuFindAdmin/tests/unit-tests/phpunit.xml b/module/VuFindAdmin/tests/unit-tests/phpunit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ded91aaf8294579dc2ec0f5a6e190c1218b68514
--- /dev/null
+++ b/module/VuFindAdmin/tests/unit-tests/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
+  <testsuites>
+    <testsuite name="VuFindAdmin">
+      <directory>src</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/module/VuFindApi/tests/unit-tests/phpunit.xml b/module/VuFindApi/tests/unit-tests/phpunit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..477b0376cfc1652c5614791a5259fb4f6861def2
--- /dev/null
+++ b/module/VuFindApi/tests/unit-tests/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
+  <testsuites>
+    <testsuite name="VuFindApi">
+      <directory>src</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/module/VuFindConsole/tests/unit-tests/bootstrap.php b/module/VuFindConsole/tests/unit-tests/bootstrap.php
deleted file mode 100644
index d63f479a605aa5bebb07a6ac2b0a3b9fa9843d98..0000000000000000000000000000000000000000
--- a/module/VuFindConsole/tests/unit-tests/bootstrap.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Search subsystem PHPUnit bootstrap.
- *
- * @author    David Maus <maus@hab.de>
- * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @copyright Copyright (C) Villanova University 2011
- */
-require_once'Zend/Loader/AutoloaderFactory.php';
-\Zend\Loader\AutoloaderFactory::factory(
-    [
-        'Zend\Loader\StandardAutoloader' => [
-            'namespaces' => [
-                'VuFindConsole' => realpath(__DIR__ . '/../../src/VuFindConsole'),
-                'VuFindTest' => realpath(__DIR__ . '/src/VuFindTest'),
-            ],
-            'autoregister_zf' => true
-        ]
-    ]
-);
diff --git a/module/VuFindConsole/tests/unit-tests/phpunit.xml b/module/VuFindConsole/tests/unit-tests/phpunit.xml
index c3eb7bfac2324a9ec5a3f6ce9b92d5ab9fb3d06e..89f88214e8c4822064c7f07faed3480583539e36 100644
--- a/module/VuFindConsole/tests/unit-tests/phpunit.xml
+++ b/module/VuFindConsole/tests/unit-tests/phpunit.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="bootstrap.php"
-         strict="true">
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
   <testsuites>
     <testsuite name="VuFindConsole">
       <directory>src</directory>
     </testsuite>
   </testsuites>
-  <php>
-    <includePath>../../../../vendor/zendframework/zendframework/library</includePath>
-  </php>
 </phpunit>
diff --git a/module/VuFindDevTools/tests/unit-tests/phpunit.xml b/module/VuFindDevTools/tests/unit-tests/phpunit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7b540e68c81ef722228957b50a52cbd04d2c4945
--- /dev/null
+++ b/module/VuFindDevTools/tests/unit-tests/phpunit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
+  <testsuites>
+    <testsuite name="VuFindDevTools">
+      <directory>src</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/module/VuFindSearch/tests/unit-tests/bootstrap.php b/module/VuFindSearch/tests/unit-tests/bootstrap.php
deleted file mode 100644
index 4246ed53344f408e4c66f3996904412dec16c2a6..0000000000000000000000000000000000000000
--- a/module/VuFindSearch/tests/unit-tests/bootstrap.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Search subsystem PHPUnit bootstrap.
- *
- * @author    David Maus <maus@hab.de>
- * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @copyright Copyright (C) Villanova University 2011
- */
-require_once'Zend/Loader/AutoloaderFactory.php';
-\Zend\Loader\AutoloaderFactory::factory(
-    [
-        'Zend\Loader\StandardAutoloader' => [
-            'namespaces' => [
-                'VuFindSearch' => realpath(__DIR__ . '/../../src/VuFindSearch'),
-                'VuFindTest' => realpath(__DIR__ . '/src/VuFindTest'),
-            ],
-            'autoregister_zf' => true
-        ]
-    ]
-);
-
-define('PHPUNIT_SEARCH_FIXTURES', realpath(__DIR__ . '/fixtures'));
diff --git a/module/VuFindSearch/tests/unit-tests/phpunit.xml b/module/VuFindSearch/tests/unit-tests/phpunit.xml
index d02b07e2e4a9a900b0b3073a1a725ec1e1be03fc..a3ceb08d21fc7a9495347c57a8c94230def29f80 100644
--- a/module/VuFindSearch/tests/unit-tests/phpunit.xml
+++ b/module/VuFindSearch/tests/unit-tests/phpunit.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="bootstrap.php"
-         strict="true">
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
   <testsuites>
     <testsuite name="VuFindSearch">
       <directory>src</directory>
     </testsuite>
   </testsuites>
-  <php>
-    <includePath>../../../../vendor/zendframework/zendframework/library</includePath>
-  </php>
 </phpunit>
diff --git a/module/VuFindTheme/tests/unit-tests/bootstrap.php b/module/VuFindTheme/tests/unit-tests/bootstrap.php
deleted file mode 100644
index 26c6bf5d5ba646336eeba6463ef4da810d777c77..0000000000000000000000000000000000000000
--- a/module/VuFindTheme/tests/unit-tests/bootstrap.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Search subsystem PHPUnit bootstrap.
- *
- * @author    David Maus <maus@hab.de>
- * @license   http://opensource.org/licenses/gpl-2.0.php GNU General Public License
- * @copyright Copyright (C) Villanova University 2011
- */
-require_once 'Zend/Loader/AutoloaderFactory.php';
-\Zend\Loader\AutoloaderFactory::factory(
-    [
-        'Zend\Loader\StandardAutoloader' => [
-            'namespaces' => [
-                'VuFindTheme' => realpath(__DIR__ . '/../../src/VuFindTheme'),
-                'VuFindTest' => realpath(__DIR__ . '/src/VuFindTest'),
-            ],
-            'autoregister_zf' => true
-        ]
-    ]
-);
diff --git a/module/VuFindTheme/tests/unit-tests/phpunit.xml b/module/VuFindTheme/tests/unit-tests/phpunit.xml
index 55ee799fff4729d139d52edbe223da5076b2eb61..4155e641489c324330ed954cdb6226541e35d35c 100644
--- a/module/VuFindTheme/tests/unit-tests/phpunit.xml
+++ b/module/VuFindTheme/tests/unit-tests/phpunit.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="bootstrap.php"
-         strict="true">
+<phpunit bootstrap="../../../VuFind/tests/bootstrap.php">
   <testsuites>
     <testsuite name="VuFindTheme">
       <directory>src</directory>
     </testsuite>
   </testsuites>
-  <php>
-    <includePath>../../../../vendor/zendframework/zendframework/library</includePath>
-  </php>
 </phpunit>