diff --git a/.gitignore b/.gitignore
index 8a46f7b20..3084ea2c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 
 # composer reserver directory, from sources, populate/update using "composer install"
 vendor/*
-test/*/vendor/*
+tests/*/vendor/*
 
 # all conf but listing prevention
 /conf/**
@@ -33,7 +33,7 @@ test/*/vendor/*
 !/log/web.config
 
 # PHPUnit cache file
-/test/php-unit-tests/.phpunit.result.cache
+/tests/php-unit-tests/.phpunit.result.cache
 
 
 # Jetbrains
diff --git a/test/ci_description.ini b/test/ci_description.ini
deleted file mode 100644
index ed14d2c87..000000000
--- a/test/ci_description.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[itop]
-itop_setup=test/setup_params/default-params.xml
-itop_backup=test/backups/backup-itop.tar.gz
-
-[phpunit]
-; when empty phpunit_xml => no phpunit test performed
-; phpunit xml file description. required for phpunit testing
-phpunit_xml=test/php-unit-tests/phpunit.xml.dist
diff --git a/test/backups/backup-itop.tar.gz b/tests/backups/backup-itop.tar.gz
similarity index 100%
rename from test/backups/backup-itop.tar.gz
rename to tests/backups/backup-itop.tar.gz
diff --git a/tests/ci_description.ini b/tests/ci_description.ini
new file mode 100644
index 000000000..65396a54f
--- /dev/null
+++ b/tests/ci_description.ini
@@ -0,0 +1,8 @@
+[itop]
+itop_setup=tests/setup_params/default-params.xml
+itop_backup=tests/backups/backup-itop.tar.gz
+
+[phpunit]
+; when empty phpunit_xml => no phpunit test performed
+; phpunit xml file description. required for phpunit testing
+phpunit_xml=tests/php-unit-tests/phpunit.xml.dist
diff --git a/test/manual-visual-tests/attributeset_widget_poc.html b/tests/manual-visual-tests/attributeset_widget_poc.html
similarity index 100%
rename from test/manual-visual-tests/attributeset_widget_poc.html
rename to tests/manual-visual-tests/attributeset_widget_poc.html
diff --git a/test/manual-visual-tests/sanitize_test.php b/tests/manual-visual-tests/sanitize_test.php
similarity index 100%
rename from test/manual-visual-tests/sanitize_test.php
rename to tests/manual-visual-tests/sanitize_test.php
diff --git a/test/php-unit-tests/ItopDataTestCase.php b/tests/php-unit-tests/ItopDataTestCase.php
similarity index 100%
rename from test/php-unit-tests/ItopDataTestCase.php
rename to tests/php-unit-tests/ItopDataTestCase.php
diff --git a/test/php-unit-tests/ItopTestCase.php b/tests/php-unit-tests/ItopTestCase.php
similarity index 100%
rename from test/php-unit-tests/ItopTestCase.php
rename to tests/php-unit-tests/ItopTestCase.php
diff --git a/test/php-unit-tests/README.md b/tests/php-unit-tests/README.md
similarity index 100%
rename from test/php-unit-tests/README.md
rename to tests/php-unit-tests/README.md
diff --git a/test/php-unit-tests/composer.json b/tests/php-unit-tests/composer.json
similarity index 100%
rename from test/php-unit-tests/composer.json
rename to tests/php-unit-tests/composer.json
diff --git a/test/php-unit-tests/integration-tests/DictionariesConsistencyTest.php b/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
similarity index 100%
rename from test/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
rename to tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
diff --git a/test/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php b/tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php
similarity index 100%
rename from test/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php
rename to tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php
diff --git a/test/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php b/tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php
similarity index 100%
rename from test/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php
rename to tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php
diff --git a/test/php-unit-tests/legacy-tests/GroupByAndFunctions.php b/tests/php-unit-tests/legacy-tests/GroupByAndFunctions.php
similarity index 99%
rename from test/php-unit-tests/legacy-tests/GroupByAndFunctions.php
rename to tests/php-unit-tests/legacy-tests/GroupByAndFunctions.php
index 8806dd737..15e2c3e77 100644
--- a/test/php-unit-tests/legacy-tests/GroupByAndFunctions.php
+++ b/tests/php-unit-tests/legacy-tests/GroupByAndFunctions.php
@@ -41,7 +41,7 @@ else
 }
 $bError = false;
 $oP = new iTopWebPage('Database inconsistencies');
-$oP->set_base(utils::GetAbsoluteUrlAppRoot().'test/');
+$oP->set_base(utils::GetAbsoluteUrlAppRoot().'tests/');
 $oP->set_title('Grouping with functions');
 $oP->add('<div style="padding: 15px;"><h2>Grouping with functions</h2>');
 $oP->add('<div style="padding: 15px; background: #ddd;">');
diff --git a/test/php-unit-tests/legacy-tests/README.md b/tests/php-unit-tests/legacy-tests/README.md
similarity index 100%
rename from test/php-unit-tests/legacy-tests/README.md
rename to tests/php-unit-tests/legacy-tests/README.md
diff --git a/test/php-unit-tests/legacy-tests/VerifyOQL.php b/tests/php-unit-tests/legacy-tests/VerifyOQL.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/VerifyOQL.php
rename to tests/php-unit-tests/legacy-tests/VerifyOQL.php
diff --git a/test/php-unit-tests/legacy-tests/benchmark.php b/tests/php-unit-tests/legacy-tests/benchmark.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/benchmark.php
rename to tests/php-unit-tests/legacy-tests/benchmark.php
diff --git a/test/php-unit-tests/legacy-tests/build_test_oql.php b/tests/php-unit-tests/legacy-tests/build_test_oql.php
similarity index 97%
rename from test/php-unit-tests/legacy-tests/build_test_oql.php
rename to tests/php-unit-tests/legacy-tests/build_test_oql.php
index 109598ab1..0a3fd8c02 100644
--- a/test/php-unit-tests/legacy-tests/build_test_oql.php
+++ b/tests/php-unit-tests/legacy-tests/build_test_oql.php
@@ -28,7 +28,7 @@ require_once(APPROOT.'application/startup.inc.php');
 \LoginWebPage::DoLogin(true);
 
 $sOQLFile = APPROOT.'log/oql_records.txt';
-$sTestFile = APPROOT.'test/core/oql_records.php';
+$sTestFile = APPROOT.'tests/core/oql_records.php';
 
 $oTestHandle = @fopen($sTestFile, "w");
 
@@ -77,7 +77,7 @@ echo "File '$sTestFile' generated with $iCount entries (from $iRead captured OQL
 
 
 $sOQLFile = APPROOT.'log/oql_group_by_records.txt';
-$sTestFile = APPROOT.'test/core/oql_group_by_records.php';
+$sTestFile = APPROOT.'tests/core/oql_group_by_records.php';
 
 $oTestHandle = @fopen($sTestFile, "w");
 
diff --git a/test/php-unit-tests/legacy-tests/config-test-farm.php b/tests/php-unit-tests/legacy-tests/config-test-farm.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/config-test-farm.php
rename to tests/php-unit-tests/legacy-tests/config-test-farm.php
diff --git a/test/php-unit-tests/legacy-tests/display_cache_content.php b/tests/php-unit-tests/legacy-tests/display_cache_content.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/display_cache_content.php
rename to tests/php-unit-tests/legacy-tests/display_cache_content.php
diff --git a/test/php-unit-tests/legacy-tests/replay_query_log.php b/tests/php-unit-tests/legacy-tests/replay_query_log.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/replay_query_log.php
rename to tests/php-unit-tests/legacy-tests/replay_query_log.php
diff --git a/test/php-unit-tests/legacy-tests/test.class.inc.php b/tests/php-unit-tests/legacy-tests/test.class.inc.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/test.class.inc.php
rename to tests/php-unit-tests/legacy-tests/test.class.inc.php
diff --git a/test/php-unit-tests/legacy-tests/test.php b/tests/php-unit-tests/legacy-tests/test.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/test.php
rename to tests/php-unit-tests/legacy-tests/test.php
diff --git a/test/php-unit-tests/legacy-tests/testlist.inc.php b/tests/php-unit-tests/legacy-tests/testlist.inc.php
similarity index 100%
rename from test/php-unit-tests/legacy-tests/testlist.inc.php
rename to tests/php-unit-tests/legacy-tests/testlist.inc.php
diff --git a/test/php-unit-tests/phpunit.xml.dist b/tests/php-unit-tests/phpunit.xml.dist
similarity index 100%
rename from test/php-unit-tests/phpunit.xml.dist
rename to tests/php-unit-tests/phpunit.xml.dist
diff --git a/test/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php b/tests/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php
similarity index 100%
rename from test/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php
rename to tests/php-unit-tests/post-build-integration-tests/SetupCssIntegrityChecklistTest.php
diff --git a/test/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php b/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
similarity index 100%
rename from test/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
rename to tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
diff --git a/test/php-unit-tests/post-build-integration-tests/iTopModuleXmlInstallationChecklistTest.php b/tests/php-unit-tests/post-build-integration-tests/iTopModuleXmlInstallationChecklistTest.php
similarity index 100%
rename from test/php-unit-tests/post-build-integration-tests/iTopModuleXmlInstallationChecklistTest.php
rename to tests/php-unit-tests/post-build-integration-tests/iTopModuleXmlInstallationChecklistTest.php
diff --git a/test/php-unit-tests/postbuild_integration.xml.dist b/tests/php-unit-tests/postbuild_integration.xml.dist
similarity index 100%
rename from test/php-unit-tests/postbuild_integration.xml.dist
rename to tests/php-unit-tests/postbuild_integration.xml.dist
diff --git a/test/php-unit-tests/unitary-tests/application/DashboardLayoutTest.php b/tests/php-unit-tests/unitary-tests/application/DashboardLayoutTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/DashboardLayoutTest.php
rename to tests/php-unit-tests/unitary-tests/application/DashboardLayoutTest.php
diff --git a/test/php-unit-tests/unitary-tests/application/privUITransactionFileTest.php b/tests/php-unit-tests/unitary-tests/application/privUITransactionFileTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/privUITransactionFileTest.php
rename to tests/php-unit-tests/unitary-tests/application/privUITransactionFileTest.php
diff --git a/test/php-unit-tests/unitary-tests/application/utilsTest.php b/tests/php-unit-tests/unitary-tests/application/utilsTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/utilsTest.php
rename to tests/php-unit-tests/unitary-tests/application/utilsTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php b/tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php
rename to tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php
diff --git a/test/php-unit-tests/unitary-tests/core/CMDBObjectTest.php b/tests/php-unit-tests/unitary-tests/core/CMDBObjectTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/CMDBObjectTest.php
rename to tests/php-unit-tests/unitary-tests/core/CMDBObjectTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php b/tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php
rename to tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/CMDBSource/DeadLockInjection.php b/tests/php-unit-tests/unitary-tests/core/CMDBSource/DeadLockInjection.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/CMDBSource/DeadLockInjection.php
rename to tests/php-unit-tests/unitary-tests/core/CMDBSource/DeadLockInjection.php
diff --git a/test/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php b/tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
rename to tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php b/tests/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigTest.php b/tests/php-unit-tests/unitary-tests/core/ConfigTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigTest.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-joker.php b/tests/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-joker.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-joker.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-joker.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-var.php b/tests/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-var.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-var.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigTest/config-itop-var.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_config_plus_code.php b/tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_config_plus_code.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_config_plus_code.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_config_plus_code.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_function.php b/tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_function.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_function.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_KO_function.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID.php b/tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID_log-level-min_const.php b/tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID_log-level-min_const.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID_log-level-min_const.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigValidator/config-itop_VALID_log-level-min_const.php
diff --git a/test/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php b/tests/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php
rename to tests/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/DBObjectTest.php b/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/DBObjectTest.php
rename to tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/DBSearchCommitTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchCommitTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/DBSearchCommitTest.php
rename to tests/php-unit-tests/unitary-tests/core/DBSearchCommitTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php
rename to tests/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php
rename to tests/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/DBSearchTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/DBSearchTest.php
rename to tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php
rename to tests/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/ExpressionTest.php b/tests/php-unit-tests/unitary-tests/core/ExpressionTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ExpressionTest.php
rename to tests/php-unit-tests/unitary-tests/core/ExpressionTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/LogAPITest.php b/tests/php-unit-tests/unitary-tests/core/LogAPITest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/LogAPITest.php
rename to tests/php-unit-tests/unitary-tests/core/LogAPITest.php
diff --git a/test/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php b/tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php
rename to tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/MetaModelTest.php b/tests/php-unit-tests/unitary-tests/core/MetaModelTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/MetaModelTest.php
rename to tests/php-unit-tests/unitary-tests/core/MetaModelTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/OQLParserTest.php b/tests/php-unit-tests/unitary-tests/core/OQLParserTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/OQLParserTest.php
rename to tests/php-unit-tests/unitary-tests/core/OQLParserTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/OQLTest.php b/tests/php-unit-tests/unitary-tests/core/OQLTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/OQLTest.php
rename to tests/php-unit-tests/unitary-tests/core/OQLTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/TagSetFieldDataTest.php b/tests/php-unit-tests/unitary-tests/core/TagSetFieldDataTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/TagSetFieldDataTest.php
rename to tests/php-unit-tests/unitary-tests/core/TagSetFieldDataTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/TriggerTest.php b/tests/php-unit-tests/unitary-tests/core/TriggerTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/TriggerTest.php
rename to tests/php-unit-tests/unitary-tests/core/TriggerTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php b/tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php
rename to tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/UserRightsTest.php b/tests/php-unit-tests/unitary-tests/core/UserRightsTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/UserRightsTest.php
rename to tests/php-unit-tests/unitary-tests/core/UserRightsTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessMockConfig.php b/tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessMockConfig.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessMockConfig.php
rename to tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessMockConfig.php
diff --git a/test/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php b/tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php
similarity index 97%
rename from test/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php
rename to tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php
index e7a85f62b..a8cef1666 100644
--- a/test/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php
@@ -11,7 +11,7 @@ class WeeklyScheduledProcessTest extends ItopTestCase
 	{
 		parent::setUp();
 		require_once(APPROOT.'core/backgroundprocess.inc.php');
-		require_once(APPROOT.'test/core/WeeklyScheduledProcessMockConfig.php');
+		require_once(APPROOT.'tests/core/WeeklyScheduledProcessMockConfig.php');
 	}
 
 
diff --git a/test/php-unit-tests/unitary-tests/core/apcEmulationTest.php b/tests/php-unit-tests/unitary-tests/core/apcEmulationTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/apcEmulationTest.php
rename to tests/php-unit-tests/unitary-tests/core/apcEmulationTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/dictApcuTest.php b/tests/php-unit-tests/unitary-tests/core/dictApcuTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/dictApcuTest.php
rename to tests/php-unit-tests/unitary-tests/core/dictApcuTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/dictTest.php b/tests/php-unit-tests/unitary-tests/core/dictTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/dictTest.php
rename to tests/php-unit-tests/unitary-tests/core/dictTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php b/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
rename to tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/mockApcEmulation.incphp b/tests/php-unit-tests/unitary-tests/core/mockApcEmulation.incphp
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/mockApcEmulation.incphp
rename to tests/php-unit-tests/unitary-tests/core/mockApcEmulation.incphp
diff --git a/test/php-unit-tests/unitary-tests/core/mockDict.incphp b/tests/php-unit-tests/unitary-tests/core/mockDict.incphp
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/mockDict.incphp
rename to tests/php-unit-tests/unitary-tests/core/mockDict.incphp
diff --git a/test/php-unit-tests/unitary-tests/core/ormLinkSetTest.php b/tests/php-unit-tests/unitary-tests/core/ormLinkSetTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ormLinkSetTest.php
rename to tests/php-unit-tests/unitary-tests/core/ormLinkSetTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/ormTagSetTest.php b/tests/php-unit-tests/unitary-tests/core/ormTagSetTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/ormTagSetTest.php
rename to tests/php-unit-tests/unitary-tests/core/ormTagSetTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php b/tests/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php b/tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php
similarity index 99%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php
index 28df546ab..f5448e701 100644
--- a/test/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php
@@ -222,7 +222,7 @@ class HTMLDOMSanitizerTest extends AbstractDOMSanitizerTest
 	 */
 	public function testDoSanitizeCallInlineImageProcessImageTag($sHtml, $iExpectedCount)
 	{
-		require_once APPROOT.'test/core/sanitizer/InlineImageMock.php';
+		require_once APPROOT.'tests/core/sanitizer/InlineImageMock.php';
 		InlineImageMock::ResetCallCounter();
 
 		$oSanitizer = new HTMLDOMSanitizer(InlineImageMock::class);
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/InlineImageMock.php b/tests/php-unit-tests/unitary-tests/core/sanitizer/InlineImageMock.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/InlineImageMock.php
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/InlineImageMock.php
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/README.txt b/tests/php-unit-tests/unitary-tests/core/sanitizer/README.txt
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/README.txt
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/README.txt
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/SvgDOMSanitizerTest.php b/tests/php-unit-tests/unitary-tests/core/sanitizer/SvgDOMSanitizerTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/SvgDOMSanitizerTest.php
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/SvgDOMSanitizerTest.php
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.html b/tests/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.html
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.html
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.html
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.svg b/tests/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.svg
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.svg
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/input/scripts.svg
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt b/tests/php-unit-tests/unitary-tests/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/input/utf-8_wrong_character_email_truncated.txt
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/input/whitelist_test.html b/tests/php-unit-tests/unitary-tests/core/sanitizer/input/whitelist_test.html
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/input/whitelist_test.html
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/input/whitelist_test.html
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.html b/tests/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.html
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.html
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.html
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.svg b/tests/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.svg
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.svg
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/output/scripts.svg
diff --git a/test/php-unit-tests/unitary-tests/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt b/tests/php-unit-tests/unitary-tests/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt
similarity index 100%
rename from test/php-unit-tests/unitary-tests/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt
rename to tests/php-unit-tests/unitary-tests/core/sanitizer/output/utf-8_wrong_character_email_truncated.txt
diff --git a/test/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php
similarity index 98%
rename from test/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php
rename to tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php
index b82eeee6b..12a1c34f4 100644
--- a/test/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php
+++ b/tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php
@@ -25,7 +25,7 @@ class UserLocalTest extends ItopDataTestCase
 	{
 		parent::setUp();
 
-		require_once(APPROOT.'test/php-unit-tests/tests/datamodels/2.x/authent-local/UserLocalTest/UserLocalPasswordPolicyMock.php');
+		require_once(APPROOT.'tests/php-unit-tests/tests/datamodels/2.x/authent-local/UserLocalTest/UserLocalPasswordPolicyMock.php');
 		require_once(APPROOT.'env-production/authent-local/model.authent-local.php');
 	}
 
diff --git a/test/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest/UserLocalPasswordPolicyMock.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest/UserLocalPasswordPolicyMock.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest/UserLocalPasswordPolicyMock.php
rename to tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest/UserLocalPasswordPolicyMock.php
diff --git a/test/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php
rename to tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php
diff --git a/test/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php
rename to tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php
diff --git a/test/php-unit-tests/unitary-tests/datamodels/2.x/itop-tickets/itopTicketTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-tickets/itopTicketTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/datamodels/2.x/itop-tickets/itopTicketTest.php
rename to tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-tickets/itopTicketTest.php
diff --git a/test/php-unit-tests/unitary-tests/setup/DBBackupTest.php b/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/setup/DBBackupTest.php
rename to tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
diff --git a/test/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php b/tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php
rename to tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php
diff --git a/test/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
similarity index 100%
rename from test/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
rename to tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
diff --git a/test/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml
similarity index 100%
rename from test/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml
rename to tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/1.7_to_1.6.input.xml
diff --git a/test/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php
rename to tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php
diff --git a/test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php b/tests/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
rename to tests/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
diff --git a/test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
rename to tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
diff --git a/test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html
rename to tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html
diff --git a/test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html.twig b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html.twig
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html.twig
rename to tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/test.html.twig
diff --git a/test/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php b/tests/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
rename to tests/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
diff --git a/test/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php b/tests/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
rename to tests/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
diff --git a/test/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php b/tests/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php
rename to tests/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php
diff --git a/test/php-unit-tests/unitary-tests/status/StatusIncTest.php b/tests/php-unit-tests/unitary-tests/status/StatusIncTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/status/StatusIncTest.php
rename to tests/php-unit-tests/unitary-tests/status/StatusIncTest.php
diff --git a/test/php-unit-tests/unitary-tests/status/StatusTest.php b/tests/php-unit-tests/unitary-tests/status/StatusTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/status/StatusTest.php
rename to tests/php-unit-tests/unitary-tests/status/StatusTest.php
diff --git a/test/php-unit-tests/unitary-tests/status/status.php b/tests/php-unit-tests/unitary-tests/status/status.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/status/status.php
rename to tests/php-unit-tests/unitary-tests/status/status.php
diff --git a/test/php-unit-tests/unitary-tests/webservices/RestTest.php b/tests/php-unit-tests/unitary-tests/webservices/RestTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/webservices/RestTest.php
rename to tests/php-unit-tests/unitary-tests/webservices/RestTest.php
diff --git a/test/php-unit-tests/unittestautoload.php b/tests/php-unit-tests/unittestautoload.php
similarity index 100%
rename from test/php-unit-tests/unittestautoload.php
rename to tests/php-unit-tests/unittestautoload.php
diff --git a/test/setup_params/default-params.xml b/tests/setup_params/default-params.xml
similarity index 100%
rename from test/setup_params/default-params.xml
rename to tests/setup_params/default-params.xml
diff --git a/test/setup_params/setup.xml b/tests/setup_params/setup.xml
similarity index 100%
rename from test/setup_params/setup.xml
rename to tests/setup_params/setup.xml