diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 468c3398..80914fe2 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -18,5 +18,5 @@ pipelines:
           - mysql -u piler -ppiler123 piler1 < /usr/share/piler/db-mysql.sql
           - cd unit_tests
           - ./run.sh
-          - cd ..
+          - cd ../webui
           - phpunit
diff --git a/phpunit.xml b/webui/phpunit.xml
similarity index 56%
rename from phpunit.xml
rename to webui/phpunit.xml
index a940f772..18034cdc 100644
--- a/phpunit.xml
+++ b/webui/phpunit.xml
@@ -2,11 +2,11 @@
 <phpunit colors="true">
     <testsuites>
         <testsuite name="Application Test Suite">
-            <directory>./unit_tests/php</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
     <php>
-        <env name="DIR_BASE" value="webui/" />
-        <env name="TEST_FILES_DIR" value="test_files/" />
+        <env name="DIR_BASE" value="./" />
+        <env name="TEST_FILES_DIR" value="../test_files/" />
     </php>
 </phpunit>
diff --git a/unit_tests/php/EmailTest.php b/webui/tests/EmailTest.php
similarity index 100%
rename from unit_tests/php/EmailTest.php
rename to webui/tests/EmailTest.php
diff --git a/unit_tests/php/FormatTest.php b/webui/tests/FormatTest.php
similarity index 91%
rename from unit_tests/php/FormatTest.php
rename to webui/tests/FormatTest.php
index 9b2e85fc..c9714619 100644
--- a/unit_tests/php/FormatTest.php
+++ b/webui/tests/FormatTest.php
@@ -2,9 +2,9 @@
 
 use PHPUnit\Framework\TestCase;
 
-include_once("webui/system/model.php");
-include_once("webui/system/misc.php");
-include_once("webui/model/health/health.php");
+include_once("system/model.php");
+include_once("system/misc.php");
+include_once("model/health/health.php");
 
 final class FormatTest extends TestCase
 {
diff --git a/unit_tests/php/ParseMessageTest.php b/webui/tests/ParseMessageTest.php
similarity index 100%
rename from unit_tests/php/ParseMessageTest.php
rename to webui/tests/ParseMessageTest.php
diff --git a/unit_tests/php/SplitMessageTest.php b/webui/tests/SplitMessageTest.php
similarity index 100%
rename from unit_tests/php/SplitMessageTest.php
rename to webui/tests/SplitMessageTest.php