diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeTest.php
new file mode 100644
index 0000000..062daa5
--- /dev/null
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/RearrangeTest.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views_ui\tests\RearrangeTest.
+ */
+
+namespace Drupal\views_ui\Tests;
+
+/**
+ * Tests the reordering of fields via AJAX.
+ *
+ * @see \Drupal\views_ui\Form\Ajax\Rearrange
+ */
+class RearrangeFieldsTest extends UITestBase {
+
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = array('test_view');
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Rearrange fields',
+      'description' => 'Tests the reordering of fields',
+      'group' => 'Views UI',
+    );
+  }
+
+  /**
+   * Gets the fields from the View.
+   */
+  protected function getViewFields($view_name = 'test_view', $display_id = 'default') {
+    $view = views_get_view($view_name);
+    $view->setDisplay($display_id);
+    $fields = array();
+    foreach ($view->displayHandlers->get('default')->getHandlers('field') as $field => $handler) {
+      $fields[] = $field;
+    }
+    return $fields;
+  }
+
+  /**
+   * Check if the fields are in the correct order.
+   */
+  protected function assertFieldOrder($view_name, $fields) {
+    $this->drupalGet('/admin/structure/views/nojs/rearrange/' . $view_name . '/default/field');
+
+    foreach ($fields as $idx => $field) {
+      $this->assertFieldById('edit-fields-' . $field . '-weight', $idx + 1);
+    }
+  }
+
+  /**
+   * Tests that the order on the rearrange form matches the creation order if
+   * unchanged.
+   */
+  public function testRearrangeFormInitialOrder() {
+    $view_name = 'test_view';
+
+    $this->assertFieldOrder($view_name, $this->getViewFields($view_name));
+  }
+
+  /**
+   * Tests that the new field order is respected.
+   */
+  public function testRearrangeValidValues() {
+    $view_name = 'test_view';
+    $reversedFields = array_reverse($this->getViewFields($view_name));
+
+    $fields = array();
+    foreach ($reversedFields as $delta => $field) {
+      $fields['fields[' . $field . '][weight]'] = $delta;
+    }
+
+    $this->drupalPost('/admin/structure/views/nojs/rearrange/' . $view_name . '/default/field', $fields, t('Apply'));
+
+    $this->assertFieldOrder($view_name, $reversedFields);
+  }
+
+  /**
+   * Tests that a field is not deleted if a value is not passed back.
+   */
+  public function testRearrangeEmptyValues() {
+    $view_name = 'test_view';
+    $fields = array();
+
+    $this->drupalPost('/admin/structure/views/nojs/rearrange/' . $view_name . '/default/field', $fields, t('Apply'));
+
+    $this->assertFieldOrder($view_name, $this->getViewFields($view_name));
+  }
+
+}