diff --git a/tests/php-unit-tests/unitary-tests/sources/Application/Service/EventTest.php b/tests/php-unit-tests/unitary-tests/sources/Application/Service/EventTest.php
index 8428dc969..69388453c 100644
--- a/tests/php-unit-tests/unitary-tests/sources/Application/Service/EventTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/Application/Service/EventTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Combodo\iTop\Test\UnitTest\Service;
+namespace Combodo\iTop\Test\UnitTest\Application\Service;
 
 use Combodo\iTop\Service\Events\Description\EventDescription;
 use Combodo\iTop\Service\Events\EventData;
@@ -13,7 +13,7 @@ use TypeError;
 /**
  * Class EventTest
  *
- * @package Combodo\iTop\Test\UnitTest\Service
+ * @package Combodo\iTop\Test\UnitTest\Application\Service
  *
  */
 class EventTest extends ItopTestCase
@@ -96,8 +96,8 @@ class EventTest extends ItopTestCase
 
 		return array(
 			'method'  => array(array($oReceiver, 'OnEvent1')),
-			'static'  => array('Combodo\iTop\Test\UnitTest\Service\TestEventReceiver::OnStaticEvent1'),
-			'static2' => array(array('Combodo\iTop\Test\UnitTest\Service\TestEventReceiver', 'OnStaticEvent1')),
+			'static'  => array('Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver::OnStaticEvent1'),
+			'static2' => array(array('Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver', 'OnStaticEvent1')),
 		);
 	}
 
@@ -137,13 +137,13 @@ class EventTest extends ItopTestCase
 		$oReceiver = new TestEventReceiver();
 		EventService::RegisterListener('event_a', array($oReceiver, 'OnEvent1'));
 		EventService::RegisterListener('event_a', array($oReceiver, 'OnEvent2'));
-		EventService::RegisterListener('event_a', array('Combodo\iTop\Test\UnitTest\Service\TestEventReceiver', 'OnStaticEvent1'));
-		EventService::RegisterListener('event_a', 'Combodo\iTop\Test\UnitTest\Service\TestEventReceiver::OnStaticEvent2');
+		EventService::RegisterListener('event_a', array('Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver', 'OnStaticEvent1'));
+		EventService::RegisterListener('event_a', 'Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver::OnStaticEvent2');
 
 		EventService::RegisterListener('event_b', array($oReceiver, 'OnEvent1'));
 		EventService::RegisterListener('event_b', array($oReceiver, 'OnEvent2'));
-		EventService::RegisterListener('event_b', array('Combodo\iTop\Test\UnitTest\Service\TestEventReceiver', 'OnStaticEvent1'));
-		EventService::RegisterListener('event_b', 'Combodo\iTop\Test\UnitTest\Service\TestEventReceiver::OnStaticEvent2');
+		EventService::RegisterListener('event_b', array('Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver', 'OnStaticEvent1'));
+		EventService::RegisterListener('event_b', 'Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver::OnStaticEvent2');
 
 		self::$iEventCalls = 0;
 		EventService::FireEvent(new EventData('event_a'));
@@ -234,10 +234,10 @@ class EventTest extends ItopTestCase
 		$oReceiver = new TestEventReceiver();
 		EventService::RegisterListener('event1', [$oReceiver, 'OnEvent1'], 'A', null, null, 0);
 		EventService::RegisterListener('event1', [$oReceiver, 'OnEvent2'], 'A', null, null, 1);
-		EventService::RegisterListener('event1', 'Combodo\iTop\Test\UnitTest\Service\TestEventReceiver::OnStaticEvent1', null, null, null, 2);
+		EventService::RegisterListener('event1', 'Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver::OnStaticEvent1', null, null, null, 2);
 
 		EventService::RegisterListener('event2', [$oReceiver, 'OnEvent1'], 'A', null, null, 1);
-		EventService::RegisterListener('event2', 'Combodo\iTop\Test\UnitTest\Service\TestEventReceiver::OnStaticEvent1', null, null, null, 2);
+		EventService::RegisterListener('event2', 'Combodo\iTop\Test\UnitTest\Application\Service\TestEventReceiver::OnStaticEvent1', null, null, null, 2);
 		EventService::RegisterListener('event2', [$oReceiver, 'OnEvent2'], 'B', null, null, 0);
 
 		self::$iEventCalls = 0;