diff --git a/js/pmd/move.js b/js/pmd/move.js
index 0fc1a6644f..f29c8b3165 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -404,7 +404,7 @@ function Line0(x1, y1, x2, y2, color_line)
 }
 
 /**
- * draws a angualr relation/constraint line
+ * draws a angular relation/constraint line
  */
 function Line2(x1, y1, x2, y2, color_line)
 {
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 8b9e825722..a35a3b87d0 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -40,7 +40,7 @@ function PMA_process_formset(FormDisplay $form_display)
     $formset = $formset ? "{$separator}formset=$formset" : '';
     $id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
     if ($id === null && $page == 'servers') {
-        // we've just added a new server, get it's id
+        // we've just added a new server, get its id
         $id = $form_display->getConfigFile()->getServerCount();
     }
     $id = $id ? "{$separator}id=$id" : '';
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 5fc8169dd7..6b69d28ba1 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -66,6 +66,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['cfg']['Confirm'] = "Confirm";
         $GLOBALS['cfg']['ShowHint'] = true;
 
+        $GLOBALS['cfgRelation'] = array();
+        $GLOBALS['cfgRelation']['menuswork'] = false;
         $GLOBALS['table'] = "table";
         $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
         $GLOBALS['pmaThemeImage'] = 'image';