diff --git a/test/core/CMDBSource/CMDBSourceTest.php b/test/core/CMDBSource/CMDBSourceTest.php
index 9eb26c9a2..592786b02 100644
--- a/test/core/CMDBSource/CMDBSourceTest.php
+++ b/test/core/CMDBSource/CMDBSourceTest.php
@@ -13,6 +13,11 @@ use utils;
  * @package Combodo\iTop\Test\UnitTest\Core
  */
 
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class CMDBSourceTest extends ItopTestCase
 {
 	protected function setUp()
diff --git a/test/core/ConfigPlaceholdersResolverTest.php b/test/core/ConfigPlaceholdersResolverTest.php
index 74bd10add..a9589360a 100644
--- a/test/core/ConfigPlaceholdersResolverTest.php
+++ b/test/core/ConfigPlaceholdersResolverTest.php
@@ -23,7 +23,13 @@ namespace Combodo\iTop\Test\UnitTest\Core;
 
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use ConfigPlaceholdersResolver;
+use PHPUnit\Framework\TestCase;
 
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class ConfigPlaceholdersResolverTest extends ItopTestCase
 {
 	protected function setUp()
@@ -31,7 +37,6 @@ class ConfigPlaceholdersResolverTest extends ItopTestCase
 		parent::setUp();
 		require_once (APPROOT.'core/config.class.inc.php');
 	}
-
 	/**
 	 * @dataProvider providerResolve
 	 */
diff --git a/test/core/ConfigTest.php b/test/core/ConfigTest.php
index eb78a05b8..f990cda08 100644
--- a/test/core/ConfigTest.php
+++ b/test/core/ConfigTest.php
@@ -23,7 +23,13 @@ namespace Combodo\iTop\Test\UnitTest\Core;
 
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use Config;
+use PHPUnit\Framework\TestCase;
 
+	/**
+	 * @runTestsInSeparateProcesses
+	 * @preserveGlobalState disabled
+	 * @backupGlobals disabled
+	 */
 class ConfigTest extends ItopTestCase
 {
 	protected function setUp()
diff --git a/test/core/apcEmulationTest.php b/test/core/apcEmulationTest.php
index 012a833e4..65a1d6f13 100644
--- a/test/core/apcEmulationTest.php
+++ b/test/core/apcEmulationTest.php
@@ -27,10 +27,16 @@
 namespace Combodo\iTop\Test\UnitTest\Core;
 
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use PHPUnit\Framework\TestCase;
 
 define('UNIT_MAX_CACHE_FILES', 10);
 
 
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class apcEmulationTest extends ItopTestCase
 {
 
diff --git a/test/core/dictTest.php b/test/core/dictTest.php
index 4f98c17a0..5bea10386 100644
--- a/test/core/dictTest.php
+++ b/test/core/dictTest.php
@@ -31,6 +31,11 @@ use Dict;
 use Exception;
 
 
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
 class dictTest extends ItopTestCase
 {
 	private $sEnvName;
diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php
index ff5068d60..c99008644 100644
--- a/test/integration/iTopModulesPhpVersionChecklistTest.php
+++ b/test/integration/iTopModulesPhpVersionChecklistTest.php
@@ -23,11 +23,11 @@ use iTopDesignFormat;
  * @group itop-community
  *
  * @covers iTopDesignFormat
+ *
+ * @package Combodo\iTop\Test\UnitTest\Setup
  */
 class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
 {
-
-
 	/**
 	 * Verify if the datamodel.*.xml files refer to the current itop version
 	 * This is an integration test
@@ -86,5 +86,4 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
 
 		return $aTestCases;
 	}
-
 }
diff --git a/test/integration/iTopModulesXmlVersionChecklistTest.php b/test/integration/iTopModulesXmlVersionChecklistTest.php
index eab8a3441..45a0f0a82 100644
--- a/test/integration/iTopModulesXmlVersionChecklistTest.php
+++ b/test/integration/iTopModulesXmlVersionChecklistTest.php
@@ -24,6 +24,8 @@ use iTopDesignFormat;
  * @group itop-community
  *
  * @covers iTopDesignFormat
+ *
+ * @package Combodo\iTop\Test\UnitTest\Setup
  */
 class iTopModulesXmlVersionIntegrationTest extends ItopTestCase
 {
diff --git a/test/postbuild_integration/iTopDesignFormatChecklistTest.php b/test/postbuild_integration/iTopDesignFormatChecklistTest.php
index abd4b13bd..48e7a77f6 100644
--- a/test/postbuild_integration/iTopDesignFormatChecklistTest.php
+++ b/test/postbuild_integration/iTopDesignFormatChecklistTest.php
@@ -12,6 +12,8 @@ use PHPUnit\Exception;
  * Ticket 3053 - Check XML conversion methods
  *
  * @covers iTopDesignFormat
+ *
+ * @package Combodo\iTop\Test\UnitTest\Setup
  */
 class TestForITopDesignFormatClass extends ItopTestCase
 {
diff --git a/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php b/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
index 1cee3f03b..7eda64034 100644
--- a/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
+++ b/test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
@@ -11,6 +11,8 @@ use iTopDesignFormat;
  * Ticket 3061 - Automatically check the installation.xml consistency
  *
  * @covers iTopDesignFormat
+ *
+ * @package Combodo\iTop\Test\UnitTest\Setup
  */
 class iTopModuleXmlInstallationChecklistTest extends ItopTestCase
 {