diff --git a/tests/phpunit/RetailcrmCatalogTest.php b/tests/RetailcrmCatalogTest.php
similarity index 100%
rename from tests/phpunit/RetailcrmCatalogTest.php
rename to tests/RetailcrmCatalogTest.php
diff --git a/tests/phpunit/RetailcrmDaemonCollectorTest.php b/tests/RetailcrmDaemonCollectorTest.php
similarity index 100%
rename from tests/phpunit/RetailcrmDaemonCollectorTest.php
rename to tests/RetailcrmDaemonCollectorTest.php
diff --git a/tests/phpunit/RetailcrmHistoryTest.php b/tests/RetailcrmHistoryTest.php
similarity index 100%
rename from tests/phpunit/RetailcrmHistoryTest.php
rename to tests/RetailcrmHistoryTest.php
diff --git a/tests/phpunit/RetailcrmInventoriesTest.php b/tests/RetailcrmInventoriesTest.php
similarity index 100%
rename from tests/phpunit/RetailcrmInventoriesTest.php
rename to tests/RetailcrmInventoriesTest.php
diff --git a/tests/phpunit/RetailcrmReferencesTest.php b/tests/RetailcrmReferencesTest.php
similarity index 100%
rename from tests/phpunit/RetailcrmReferencesTest.php
rename to tests/RetailcrmReferencesTest.php
diff --git a/tests/phpunit/RetailcrmTest.php b/tests/RetailcrmTest.php
similarity index 100%
rename from tests/phpunit/RetailcrmTest.php
rename to tests/RetailcrmTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 0000000..fb75d62
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,18 @@
+<?php
+
+if (is_dir(__DIR__ . '/../../PrestaShop/tests-legacy')) {
+    require_once __DIR__ . '/../../PrestaShop/tests-legacy/bootstrap.php';
+} else {
+    require_once __DIR__ . '/../../PrestaShop/tests/bootstrap.php';
+}
+
+require_once dirname(__DIR__) . '../../PrestaShop/config/config.inc.php';
+require_once dirname(__DIR__) . '../../PrestaShop/config/defines_uri.inc.php';
+require_once dirname(__DIR__) . '../retailcrm/bootstrap.php';
+require_once __DIR__ . '/../retailcrm/retailcrm.php';
+require_once dirname(__DIR__) . '../../PrestaShop/init.php';
+require_once __DIR__ . '/helpers/RetailcrmTestCase.php';
+require_once __DIR__ . '/helpers/RetailcrmTestHelper.php';
+
+$module = new RetailCRM();
+$module->install();
diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
deleted file mode 100644
index d96e7f1..0000000
--- a/tests/phpunit/bootstrap.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-if (\file_exists(__DIR__ . '/../../../PrestaShop/tests-legacy')) {
-    require_once __DIR__ . '/../../../PrestaShop/tests-legacy/bootstrap.php';
-} else {
-    require_once __DIR__ . '/../../../PrestaShop/tests/bootstrap.php';
-}
-
-require_once dirname(__DIR__) . '../../../PrestaShop/config/config.inc.php';
-require_once dirname(__DIR__) . '../../../PrestaShop/config/defines_uri.inc.php';
-require_once dirname(__DIR__) . '../../retailcrm/bootstrap.php';
-require_once __DIR__ . '/../../retailcrm/retailcrm.php';
-require_once __DIR__ . '/../helpers/RetailcrmTestCase.php';
-require_once __DIR__ . '/../helpers/RetailcrmTestHelper.php';
-require_once dirname(__DIR__) . '../../../PrestaShop/init.php';
-
-$module = new RetailCRM();
-$module->install();