diff --git a/test/OQL/DataLocalizerTest.php b/test/OQL/DataLocalizerTest.php
index 09f1d8af5..7ef28dd74 100644
--- a/test/OQL/DataLocalizerTest.php
+++ b/test/OQL/DataLocalizerTest.php
@@ -11,6 +11,7 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
  * @group itopRequestMgmt
  * @group itopVirtualizationMgmt
  * @group itopServiceMgmt
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/OQL/OQLToSQLGroupByTest.php b/test/OQL/OQLToSQLGroupByTest.php
index 8fda5411d..ff7a76e27 100644
--- a/test/OQL/OQLToSQLGroupByTest.php
+++ b/test/OQL/OQLToSQLGroupByTest.php
@@ -9,6 +9,7 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
 /**
  * @group itopRequestMgmt
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/OQL/OQLToSQLNestedSelectTest.php b/test/OQL/OQLToSQLNestedSelectTest.php
index 8eb0df6e3..9d6cbb619 100644
--- a/test/OQL/OQLToSQLNestedSelectTest.php
+++ b/test/OQL/OQLToSQLNestedSelectTest.php
@@ -14,6 +14,7 @@ use utils;
 
 /**
  * @group itopRequestMgmt
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/OQL/OQLToSQLTest.php b/test/OQL/OQLToSQLTest.php
index 82d944780..11dff955a 100644
--- a/test/OQL/OQLToSQLTest.php
+++ b/test/OQL/OQLToSQLTest.php
@@ -16,6 +16,7 @@ use utils;
  * @group itopRequestMgmt
  * @group itopVirtualizationMgmt
  * @group itopServiceMgmt
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/application/privUITransactionFileTest.php b/test/application/privUITransactionFileTest.php
index 818bcf476..7cc7ec8de 100644
--- a/test/application/privUITransactionFileTest.php
+++ b/test/application/privUITransactionFileTest.php
@@ -23,6 +23,7 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
+ *
  * @covers utils
  * @group sampleDataNeeded
  */
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index 9f1c864f6..78e9c7d34 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -44,6 +44,7 @@ use Dict;
 /**
  * @group itopRequestMgmt
  * @group itopServiceMgmt
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index 1b1c5d97c..4e2d4ec4f 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -29,6 +29,7 @@ use Exception;
 
 /**
  * @group itopRequestMgmt
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/DBObjectTest.php b/test/core/DBObjectTest.php
index 941cfcf7c..c13b3009d 100644
--- a/test/core/DBObjectTest.php
+++ b/test/core/DBObjectTest.php
@@ -32,6 +32,7 @@ use DBObject;
 
 /**
  * @group specificOrgInSampleData
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/ExpressionEvaluateTest.php b/test/core/ExpressionEvaluateTest.php
index 28cd7b9ca..eaadd576a 100644
--- a/test/core/ExpressionEvaluateTest.php
+++ b/test/core/ExpressionEvaluateTest.php
@@ -13,6 +13,11 @@ use FunctionExpression;
 use MetaModel;
 use ScalarExpression;
 
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class ExpressionEvaluateTest extends iTopDataTestCase
 {
 	const USE_TRANSACTION = false;
diff --git a/test/core/GetSelectFilterTest.php b/test/core/GetSelectFilterTest.php
index 41fe6363d..624c1a0a4 100644
--- a/test/core/GetSelectFilterTest.php
+++ b/test/core/GetSelectFilterTest.php
@@ -16,6 +16,10 @@ use utils;
  * @group sampleDataNeeded
  * Class GetSelectFilterTest
  *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ *
  * @package Combodo\iTop\Test\UnitTest\Webservices
  */
 class GetSelectFilterTest extends ItopDataTestCase
diff --git a/test/core/Log/ExceptionLogTest.php b/test/core/Log/ExceptionLogTest.php
index 9297d9cc0..379434c61 100644
--- a/test/core/Log/ExceptionLogTest.php
+++ b/test/core/Log/ExceptionLogTest.php
@@ -22,6 +22,11 @@ use MetaModel;
 
 require_once(__DIR__.'/ExceptionLogTest/Exceptions.php');
 
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class ExceptionLogTest extends ItopDataTestCase
 {
 	protected function setUp()
diff --git a/test/core/Log/LogAPITest.php b/test/core/Log/LogAPITest.php
index 8e4b4e440..158d2d9f7 100644
--- a/test/core/Log/LogAPITest.php
+++ b/test/core/Log/LogAPITest.php
@@ -17,6 +17,11 @@ namespace Combodo\iTop\Test\UnitTest\Core\Log;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use MetaModel;
 
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class LogAPITest extends ItopDataTestCase
 {
 	private $mockFileLog;
diff --git a/test/core/OQLTest.php b/test/core/OQLTest.php
index 02327aaad..7a0610101 100644
--- a/test/core/OQLTest.php
+++ b/test/core/OQLTest.php
@@ -23,6 +23,7 @@ use utils;
 
 /**
  * @group itopStructure
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/TagSetFieldDataTest.php b/test/core/TagSetFieldDataTest.php
index b8c7cc6d1..39074f620 100644
--- a/test/core/TagSetFieldDataTest.php
+++ b/test/core/TagSetFieldDataTest.php
@@ -18,6 +18,7 @@ use TagSetFieldData;
 
 /**
  * @group itopFaqLight
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/TriggerTest.php b/test/core/TriggerTest.php
index 768f1fb3b..0046993f7 100644
--- a/test/core/TriggerTest.php
+++ b/test/core/TriggerTest.php
@@ -15,6 +15,8 @@ use TriggerOnObjectCreate;
  * @package Combodo\iTop\Test\UnitTest\Core
  *
  * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
  */
 
 class TriggerTest extends ItopDataTestCase
diff --git a/test/core/UserRightsTest.php b/test/core/UserRightsTest.php
index 2848667e0..20a12034d 100644
--- a/test/core/UserRightsTest.php
+++ b/test/core/UserRightsTest.php
@@ -40,6 +40,7 @@ use utils;
 /**
  * @group itopRequestMgmt
  * @group userRights
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/XMLDataLoaderTest.php b/test/core/XMLDataLoaderTest.php
index 14fec6057..aa106db40 100644
--- a/test/core/XMLDataLoaderTest.php
+++ b/test/core/XMLDataLoaderTest.php
@@ -33,6 +33,7 @@ use MetaModel;
 
 /**
  * @group specificOrgInSampleData
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/ormCaseLogTest.php b/test/core/ormCaseLogTest.php
index 60b7141e5..ae2dfc42b 100644
--- a/test/core/ormCaseLogTest.php
+++ b/test/core/ormCaseLogTest.php
@@ -15,6 +15,7 @@ use ormCaseLog;
  * Tests of the ormCaseLog class
  *
  * @covers \ormCaseLog
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/itop-tickets/itopTicketTest.php b/test/itop-tickets/itopTicketTest.php
index 7990da693..d7509c259 100644
--- a/test/itop-tickets/itopTicketTest.php
+++ b/test/itop-tickets/itopTicketTest.php
@@ -34,6 +34,7 @@ use Exception;
  * @group itopVirtualizationMgmt
  * @group itopConfigMgmt
  * @group itopTickets
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/synchro/DataSynchroTest.php b/test/synchro/DataSynchroTest.php
index c0332361a..f07b87e30 100644
--- a/test/synchro/DataSynchroTest.php
+++ b/test/synchro/DataSynchroTest.php
@@ -30,6 +30,10 @@ use utils;
  *
  * @package Combodo\iTop\Test\UnitTest\Synchro
  * @group dataSynchro
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
  */
 class DataSynchroTest extends ItopDataTestCase
 {
diff --git a/test/webservices/RestTest.php b/test/webservices/RestTest.php
index baef75975..bf1b5ea9c 100644
--- a/test/webservices/RestTest.php
+++ b/test/webservices/RestTest.php
@@ -9,6 +9,7 @@ use Exception;
 /**
  * @group itopRequestMgmt
  * @group restApi
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled