diff --git a/export.php b/export.php
index 1bef625b5e..0b55624a02 100644
--- a/export.php
+++ b/export.php
@@ -408,7 +408,7 @@ if (!defined('TESTSUITE')) {
         // Will we need relation & co. setup?
         $do_relation = isset($GLOBALS[$what . '_relation']);
         $do_comments = isset($GLOBALS[$what . '_include_comments'])
-            || isset($GLOBALS[$what . '_comments']) ;
+            || isset($GLOBALS[$what . '_comments']);
         $do_mime     = isset($GLOBALS[$what . '_mime']);
         if ($do_relation || $do_comments || $do_mime) {
             $cfgRelation = PMA_getRelationsParam();
diff --git a/normalization.php b/normalization.php
index a988935c95..11dc8779e0 100644
--- a/normalization.php
+++ b/normalization.php
@@ -106,7 +106,7 @@ if (isset($_REQUEST['step1'])) {
 } else if (isset($_REQUEST['step3'])) {
     $res = PMA_getHtmlContentsFor1NFStep3($db, $table);
     $response->addJSON($res);
-} else if (isset ($_REQUEST['step4'])) {
+} else if (isset($_REQUEST['step4'])) {
     $res = PMA_getHtmlContentsFor1NFStep4($db, $table);
     $response->addJSON($res);
 } else if (isset($_REQUEST['step']) && $_REQUEST['step'] == 2.1) {
diff --git a/server_privileges.php b/server_privileges.php
index 78790f2e1d..79e20b3bbd 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -414,10 +414,10 @@ if (isset($_REQUEST['adduser'])) {
         );
     } else if (!empty($routinename)) {
         $response->addHTML(
-             PMA_getHtmlForRoutineSpecificPrivilges(
-                 $username, $hostname, $dbname, $routinename,
-                 (isset($url_dbname) ? $url_dbname : '')
-             )
+            PMA_getHtmlForRoutineSpecificPrivilges(
+                $username, $hostname, $dbname, $routinename,
+                (isset($url_dbname) ? $url_dbname : '')
+            )
         );
     } else {
         // A user was selected -> display the user's properties
diff --git a/test/libraries/PMA_relation_cleanup_test.php b/test/libraries/PMA_relation_cleanup_test.php
index e254b1d023..5dad56ed55 100644
--- a/test/libraries/PMA_relation_cleanup_test.php
+++ b/test/libraries/PMA_relation_cleanup_test.php
@@ -387,7 +387,7 @@ class DBI_PMA_Relation_Cleanup extends PMA_DatabaseInterface
         }
 
         if (/*overload*/mb_stripos($sql, "table_info") !== false) {
-            unset ($this->values[$this->indexs['table_info']]);
+            unset($this->values[$this->indexs['table_info']]);
         }
 
         if (/*overload*/mb_stripos($sql, "table_coords") !== false) {
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index a0d5ef8700..a305f58971 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -637,7 +637,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         list($create_user_real, $create_user_show, $real_sql_query, $sql_query)
             = PMA_getSqlQueriesForDisplayAndAddUser(
                 $username, $hostname,
-                (isset ($password) ? $password : '')
+                (isset($password) ? $password : '')
             );
         $this->assertEquals(
             "CREATE USER 'pma_username'@'pma_hostname' "