diff --git a/test/core/OQLToSQLAllClassesTest.php b/test/core/OQLToSQLAllClassesTest.php
index 46406f5b8..d41e9c5ed 100644
--- a/test/core/OQLToSQLAllClassesTest.php
+++ b/test/core/OQLToSQLAllClassesTest.php
@@ -301,11 +301,7 @@ class OQLToSQLAllCLassesTest extends ItopDataTestCase
 				continue;
 			}
 			$sOQL = "SELECT $sClass";
-			$aOrderBy = array();
-			if (MetaModel::IsValidAttCode($sClass, 'friendlyname'))
-			{
-				$aOrderBy["$sClass.friendlyname"] = true;
-			}
+			$aOrderBy = MetaModel::GetOrderByDefault($sClass);
 			$aData[$sOQL] = array($sOQL, $aOrderBy, array(), null, null, 10, 0);
 		}
 
diff --git a/test/core/OQLToSQLTest.php b/test/core/OQLToSQLTest.php
index 8070b63c1..b7b9b637a 100644
--- a/test/core/OQLToSQLTest.php
+++ b/test/core/OQLToSQLTest.php
@@ -205,6 +205,11 @@ class OQLToSQLTest extends ItopDataTestCase
 		}
 
 		$oSearch = DBSearch::FromOQL($sOQL);
+		$sClass = $oSearch->GetClass();
+		if (empty($aOrderBy))
+		{
+			$aOrderBy = MetaModel::GetOrderByDefault($sClass);
+		}
 
 		$sSQLCount = $oSearch->MakeSelectQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, 0, 0, true);
 		$fStart = $this->GetMicroTime();