diff --git a/tests/php-unit-tests/unitary-tests/core/OQLParserTest.php b/tests/php-unit-tests/unitary-tests/core/OQLParserTest.php
index 0c29c7b1a..87a42765a 100644
--- a/tests/php-unit-tests/unitary-tests/core/OQLParserTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/OQLParserTest.php
@@ -22,7 +22,6 @@ use UserRights;
 class OQLParserTest extends ItopDataTestCase
 {
 	const USE_TRANSACTION = false;
-	const CREATE_TEST_ORG = true;
 
 	/**
 	 * @group iTopChangeMgt
@@ -46,7 +45,8 @@ class OQLParserTest extends ItopDataTestCase
 
 	public function testUnknownClassOqlException()
 	{
-		$sLogin = $this->GivenUserRestrictedToAnOrganizationInDB($this->getTestOrgId(), self::$aURP_Profiles['Portal user']);
+		$oOrgId = $this->GivenObjectInDB('Organization', ['name' => 'TestOrg']);
+		$sLogin = $this->GivenUserRestrictedToAnOrganizationInDB($oOrgId, self::$aURP_Profiles['Portal user']);
 		UserRights::Login($sLogin);
 
 		try {