diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php
index 7b766c223..c76395c7d 100644
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -1106,14 +1106,14 @@ class CMDBSource
 	public static function DBCheckTableCharsetAndCollation($sTableName)
 	{
 		$sDBName = self::DBName();
-		$sTableInfoQuery = "SELECT C.character_set_name, T.table_collation
+		$sTableInfoQuery = "SELECT C.CHARACTER_SET_NAME, T.TABLE_COLLATION
 			FROM information_schema.`TABLES` T inner join information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` C
 				ON T.table_collation = C.collation_name
 			WHERE T.table_schema = '$sDBName'
   			AND T.table_name = '$sTableName';";
 		$aTableInfo = self::QueryToArray($sTableInfoQuery);
-		$sTableCharset = $aTableInfo[0]['character_set_name'];
-		$sTableCollation = $aTableInfo[0]['table_collation'];
+		$sTableCharset = $aTableInfo[0]['CHARACTER_SET_NAME'];
+		$sTableCollation = $aTableInfo[0]['TABLE_COLLATION'];
 
 		if ((DEFAULT_CHARACTER_SET == $sTableCharset) && (DEFAULT_COLLATION == $sTableCollation))
 		{
@@ -1257,7 +1257,7 @@ class CMDBSource
 	{
 		$sDBName = CMDBSource::DBName();
 		$sDBInfoQuery = "SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
-			FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$sDBName';";
+			FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = '$sDBName';";
 		$aDBInfo = CMDBSource::QueryToArray($sDBInfoQuery);
 		$sDBCharset = $aDBInfo[0]['DEFAULT_CHARACTER_SET_NAME'];
 		$sDBCollation = $aDBInfo[0]['DEFAULT_COLLATION_NAME'];
diff --git a/core/tagsetfield.class.inc.php b/core/tagsetfield.class.inc.php
index 123d68bea..dd5b4c835 100644
--- a/core/tagsetfield.class.inc.php
+++ b/core/tagsetfield.class.inc.php
@@ -183,7 +183,7 @@ abstract class TagSetFieldData extends cmdbAbstractObject
 		}
 
 		// Check that the code is not a MySQL stop word
-		$sSQL = "SELECT * FROM INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD";
+		$sSQL = "SELECT value FROM information_schema.INNODB_FT_DEFAULT_STOPWORD";
 		try
 		{
 			$aResults = CMDBSource::QueryToArray($sSQL);
diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index 98f7c63e7..bb8e9ba12 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -534,7 +534,7 @@ class SetupUtils
 		// to do... evaluate how we can correlate the DB size with the size of the dump (and the zip!)
 		// E.g. 2,28 Mb after a full install, giving a zip of 26 Kb (data = 26 Kb)
 		// Example of query (DB without a suffix)
-		//$sDBSize = "SELECT SUM(ROUND(DATA_LENGTH/1024/1024, 2)) AS size_mb FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = `$sDBName`";
+		//$sDBSize = "SELECT SUM(ROUND(DATA_LENGTH/1024/1024, 2)) AS size_mb FROM information_schema.TABLES WHERE TABLE_SCHEMA = `$sDBName`";
 
 		return $aResult;
 	}