diff --git a/setup/scripts.js b/setup/scripts.js
index 754f879e8d..c7e2fd1725 100644
--- a/setup/scripts.js
+++ b/setup/scripts.js
@@ -42,6 +42,63 @@ $(function () {
 // Form validation and field operations
 //
 
+/**
+ * Calls server-side validation procedures
+ *
+ * @param {Element} parent  input field in <fieldset> or <fieldset>
+ * @param {String}  id      validator id
+ * @param {Object}  values  values hash {element1_id: value, ...}
+ */
+function ajaxValidate(parent, id, values)
+{
+    parent = $(parent);
+    // ensure that parent is a fieldset
+    if (parent.attr('tagName') != 'FIELDSET') {
+        parent = parent.closest('fieldset');
+        if (parent.length === 0) {
+            return false;
+        }
+    }
+
+    if (parent.data('ajax') !== null) {
+        parent.data('ajax').abort();
+    }
+
+    parent.data('ajax', $.ajax({
+        url: 'validate.php',
+        cache: false,
+        type: 'POST',
+        data: {
+            token: parent.closest('form').find('input[name=token]').val(),
+            id: id,
+            values: $.toJSON(values)
+        },
+        success: function (response) {
+            if (response === null) {
+                return;
+            }
+
+            var error = {};
+            if (typeof response != 'object') {
+                error[parent.id] = [response];
+            } else if (typeof response.error != 'undefined') {
+                error[parent.id] = [response.error];
+            } else {
+                for (var key in response) {
+                    var value = response[key];
+                    error[key] = jQuery.isArray(value) ? value : [value];
+                }
+            }
+            displayErrors(error);
+        },
+        complete: function () {
+            parent.removeData('ajax');
+        }
+    }));
+
+    return true;
+}
+
 /**
  * Automatic form submission on change.
  */
@@ -120,63 +177,6 @@ $.extend(true, validators, {
     }
 });
 
-/**
- * Calls server-side validation procedures
- *
- * @param {Element} parent  input field in <fieldset> or <fieldset>
- * @param {String}  id      validator id
- * @param {Object}  values  values hash {element1_id: value, ...}
- */
-function ajaxValidate(parent, id, values)
-{
-    parent = $(parent);
-    // ensure that parent is a fieldset
-    if (parent.attr('tagName') != 'FIELDSET') {
-        parent = parent.closest('fieldset');
-        if (parent.length === 0) {
-            return false;
-        }
-    }
-
-    if (parent.data('ajax') !== null) {
-        parent.data('ajax').abort();
-    }
-
-    parent.data('ajax', $.ajax({
-        url: 'validate.php',
-        cache: false,
-        type: 'POST',
-        data: {
-            token: parent.closest('form').find('input[name=token]').val(),
-            id: id,
-            values: $.toJSON(values)
-        },
-        success: function (response) {
-            if (response === null) {
-                return;
-            }
-
-            var error = {};
-            if (typeof response != 'object') {
-                error[parent.id] = [response];
-            } else if (typeof response.error != 'undefined') {
-                error[parent.id] = [response.error];
-            } else {
-                for (var key in response) {
-                    var value = response[key];
-                    error[key] = jQuery.isArray(value) ? value : [value];
-                }
-            }
-            displayErrors(error);
-        },
-        complete: function () {
-            parent.removeData('ajax');
-        }
-    }));
-
-    return true;
-}
-
 //
 // END: Form validation and field operations
 // ------------------------------------------------------------------
diff --git a/test/libraries/PMA_charset_conversion_test.php b/test/libraries/PMA_charset_conversion_test.php
index 0ccfbe4617..b43d821bc2 100644
--- a/test/libraries/PMA_charset_conversion_test.php
+++ b/test/libraries/PMA_charset_conversion_test.php
@@ -25,6 +25,8 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase
      *
      * @return void
      * @test
+     *
+     * @group medium
      */
     public function testCharsetConversion()
     {