diff --git a/test/application/ThemeHandlerTest.php b/test/application/ThemeHandlerTest.php
index 9556cd3806..af0c155bab 100644
--- a/test/application/ThemeHandlerTest.php
+++ b/test/application/ThemeHandlerTest.php
@@ -20,7 +20,7 @@ class ThemeHandlerTest extends ItopTestCase
 	private $sTmpDir;
 	private $aDirsToCleanup= [];
 
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		require_once(APPROOT.'application/themehandler.class.inc.php');
@@ -42,7 +42,7 @@ class ThemeHandlerTest extends ItopTestCase
 		$this->RecurseCopy(APPROOT."/test/application/theme-handler/expected/css", $this->sTmpDir."/branding/css");
 	}
 
-	public function tearDown()
+	public function tearDown(): void
 	{
 		parent::tearDown();
 
diff --git a/test/core/ActionEmailTest.php b/test/core/ActionEmailTest.php
index 1149e3b566..3f78df997b 100644
--- a/test/core/ActionEmailTest.php
+++ b/test/core/ActionEmailTest.php
@@ -24,7 +24,7 @@ class ActionEmailTest extends ItopDataTestCase
 	/** @var \ActionEmail|null Temp ActionEmail created for tests */
 	protected static $oActionEmail = null;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/test/core/AttributeDefTest.inc.php b/test/core/AttributeDefTest.inc.php
index 1ff8168d88..62bc0251dc 100644
--- a/test/core/AttributeDefTest.inc.php
+++ b/test/core/AttributeDefTest.inc.php
@@ -14,7 +14,7 @@ use MetaModel;
 class AttributeDefTest extends ItopDataTestCase {
 	const CREATE_TEST_ORG = true;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 		require_once(APPROOT.'core/attributedef.class.inc.php');
 
diff --git a/test/core/AttributeURLTest.php b/test/core/AttributeURLTest.php
index 1eda57464e..08d1831993 100644
--- a/test/core/AttributeURLTest.php
+++ b/test/core/AttributeURLTest.php
@@ -11,7 +11,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
  * @backupGlobals disabled
  */
 class AttributeURLTest extends ItopTestCase {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		require_once APPROOT.'core/attributedef.class.inc.php';
diff --git a/test/core/CSVParserTest.php b/test/core/CSVParserTest.php
index 9e1d5ef894..e396cbd6b6 100644
--- a/test/core/CSVParserTest.php
+++ b/test/core/CSVParserTest.php
@@ -8,7 +8,7 @@ use CSVParser;
 
 class CSVParserTest extends ItopTestCase
 {
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/test/core/ConfigValidator/iTopConfigAstValidatorTest.php b/test/core/ConfigValidator/iTopConfigAstValidatorTest.php
index c3f0d629fd..630f47d995 100644
--- a/test/core/ConfigValidator/iTopConfigAstValidatorTest.php
+++ b/test/core/ConfigValidator/iTopConfigAstValidatorTest.php
@@ -12,7 +12,7 @@ use Exception;
 
 class iTopConfigAstValidatorTest extends ItopTestCase
 {
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 		require_once APPROOT.'env-production/itop-config/src/Validator/iTopConfigAstValidator.php';
diff --git a/test/core/DBSearchAddConditionPointingTo.php b/test/core/DBSearchAddConditionPointingTo.php
index 16a80be559..9cb15e81fb 100644
--- a/test/core/DBSearchAddConditionPointingTo.php
+++ b/test/core/DBSearchAddConditionPointingTo.php
@@ -12,7 +12,7 @@ use DBSearch;
 class DBSearchAddConditionPointingToTest extends ItopTestCase
 {
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 		require_once(APPROOT.'application/startup.inc.php');
diff --git a/test/core/GetSelectFilterTest.php b/test/core/GetSelectFilterTest.php
index 624c1a0a46..449d53c473 100644
--- a/test/core/GetSelectFilterTest.php
+++ b/test/core/GetSelectFilterTest.php
@@ -28,7 +28,7 @@ class GetSelectFilterTest extends ItopDataTestCase
 	private $sPassword = "IAAuytrez9876[}543ç_è-(";
 	private $oUser;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 		require_once(APPROOT.'application/startup.inc.php');
diff --git a/test/core/Log/ExceptionLogTest.php b/test/core/Log/ExceptionLogTest.php
index 379434c613..004596665d 100644
--- a/test/core/Log/ExceptionLogTest.php
+++ b/test/core/Log/ExceptionLogTest.php
@@ -29,7 +29,7 @@ require_once(__DIR__.'/ExceptionLogTest/Exceptions.php');
  */
 class ExceptionLogTest extends ItopDataTestCase
 {
-	protected function setUp()
+	protected function setUp(): void
 	{
 		require_once(__DIR__.'/ExceptionLogTest/Exceptions.php');
 		parent::setUp();
diff --git a/test/integration/iTopXmlVersionChecklistTest.php b/test/integration/iTopXmlVersionChecklistTest.php
index 263dc890ad..d06c1fbf3a 100644
--- a/test/integration/iTopXmlVersionChecklistTest.php
+++ b/test/integration/iTopXmlVersionChecklistTest.php
@@ -32,7 +32,7 @@ use iTopDesignFormat;
  */
 class iTopXmlVersionIntegrationTest extends ItopTestCase
 {
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();
 
diff --git a/test/setup/MFCompilerTest.php b/test/setup/MFCompilerTest.php
index 9118dbb283..bac63dd943 100644
--- a/test/setup/MFCompilerTest.php
+++ b/test/setup/MFCompilerTest.php
@@ -20,7 +20,7 @@ class MFCompilerTest extends ItopTestCase {
 
 	private $sTmpDir;
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		require_once(APPROOT.'setup/compiler.class.inc.php');
 		require_once(APPROOT.'setup/modelfactory.class.inc.php');
@@ -30,7 +30,7 @@ class MFCompilerTest extends ItopTestCase {
 		$this->oMFCompiler = new SubMFCompiler($this->createMock(\ModelFactory::class), '');
 	}
 
-	public function tearDown() {
+	public function tearDown(): void {
 		parent::tearDown();
 		$this->RecurseRmdir($this->sTmpDir);
 	}
@@ -88,7 +88,7 @@ class MFCompilerTest extends ItopTestCase {
 		}*/
 	}
 
-	public static function tearDownAfterClass()
+	public static function tearDownAfterClass(): void
 	{
 		if (is_null(self::$aFoldersToCleanup)){
 			return;
diff --git a/test/status/StatusTest.php b/test/status/StatusTest.php
index 9823d93f92..ef5a5eb765 100644
--- a/test/status/StatusTest.php
+++ b/test/status/StatusTest.php
@@ -11,7 +11,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 
 class StatusTest extends ItopTestCase
 {
-	public function setUp()
+	public function setUp(): void
 	{
 		parent::setUp();
 		require_once APPROOT.'core/config.class.inc.php'; // for constants
diff --git a/test/synchro/DataSynchroTest.php b/test/synchro/DataSynchroTest.php
index f07b87e30b..c3dea91f48 100644
--- a/test/synchro/DataSynchroTest.php
+++ b/test/synchro/DataSynchroTest.php
@@ -43,7 +43,7 @@ class DataSynchroTest extends ItopDataTestCase
 	private $oOrg1;
 	private $oOrg2;
 
-	protected function setUp()
+	protected function setUp(): void
 	{
 		parent::setUp();