diff --git a/test/core/DBSearchTest.php b/test/core/DBSearchTest.php
index 91bfd370f..f6e10ddbd 100644
--- a/test/core/DBSearchTest.php
+++ b/test/core/DBSearchTest.php
@@ -617,7 +617,7 @@ class DBSearchTest extends ItopDataTestCase
 			$sExceptionClass = get_class($e);
 		}
 
-		static::assertEquals('OQLParserException', $sExceptionClass);
+		static::assertEquals('OQLParserSyntaxErrorException', $sExceptionClass);
 	}
 
 	public function testSanity_GroupFunction_In_GroupByPart()
@@ -633,7 +633,7 @@ class DBSearchTest extends ItopDataTestCase
 			$sExceptionClass = get_class($e);
 		}
 
-		static::assertEquals('OQLParserException', $sExceptionClass);
+		static::assertEquals('OQLParserSyntaxErrorException', $sExceptionClass);
 	}
 
 	public function testSanity_UnknownGroupFunction_In_SelectPart()
diff --git a/test/core/OQLTest.php b/test/core/OQLTest.php
index 6eef2a0e6..c6f71058b 100644
--- a/test/core/OQLTest.php
+++ b/test/core/OQLTest.php
@@ -203,16 +203,16 @@ class OQLTest extends ItopDataTestCase
     public function BadQueryProvider()
     {
         return array(
-            array('SELECT toto WHERE toto.a = (3++1)', 'OQLParserException'),
-            array('SELECT toto WHHHERE toto.a = "1"', 'OQLParserException'),
-            array('SELECT toto WHERE toto.a == "1"', 'OQLParserException'),
+            array('SELECT toto WHERE toto.a = (3++1)', 'OQLParserSyntaxErrorException'),
+            array('SELECT toto WHHHERE toto.a = "1"', 'OQLParserSyntaxErrorException'),
+            array('SELECT toto WHERE toto.a == "1"', 'OQLParserSyntaxErrorException'),
             array('SELECT toto WHERE toto.a % 1', 'Exception'),
-            array('SELECT toto WHERE toto.a like \'arg\'', 'OQLParserException'),
-            array('SELECT toto WHERE toto.a NOT LIKE "That\'s "it""', 'OQLParserException'),
-            array('SELECT toto WHERE toto.a NOT LIKE \'That\'s it\'', 'OQLParserException'),
+            array('SELECT toto WHERE toto.a like \'arg\'', 'OQLParserSyntaxErrorException'),
+            array('SELECT toto WHERE toto.a NOT LIKE "That\'s "it""', 'OQLParserSyntaxErrorException'),
+            array('SELECT toto WHERE toto.a NOT LIKE \'That\'s it\'', 'OQLParserSyntaxErrorException'),
             array('SELECT toto WHERE toto.a NOT LIKE "blah \\ truc"', 'Exception'),
             array('SELECT toto WHERE toto.a NOT LIKE \'blah \\ truc\'', 'Exception'),
-            array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id = B.id WHERE A.col1 BELOW 2 AND B.id = 3', 'OQLParserException'),
+            array('SELECT A JOIN B ON A.myB = B.id JOIN C ON C.parent_id = B.id WHERE A.col1 BELOW 2 AND B.id = 3', 'OQLParserSyntaxErrorException'),
         );
     }