diff --git a/src/Tests/PathautoNodeWebTest.php b/src/Tests/PathautoNodeWebTest.php
index 482bfce..12b0e30 100644
--- a/src/Tests/PathautoNodeWebTest.php
+++ b/src/Tests/PathautoNodeWebTest.php
@@ -101,6 +101,34 @@ class PathautoNodeWebTest extends WebTestBase {
     $this->drupalGet($manual_alias);
     $this->assertText($title, 'Node accessible through manual alias.');
 
+    // Look for manual alias in the form.
+    $this->drupalGet("node/{$node->id()}/edit");
+    $this->assertNoFieldChecked('edit-path-0-pathauto');
+    $this->assertFieldByName('path[0][alias]', $manual_alias, 'Manual alias visible in the path alias field.');
+
+    // Manually update the existing node's alias.
+    $manual_alias_updated = '/content/' . $node->id() . '-updated';
+    $edit = array(
+      'path[0][pathauto]' => FALSE,
+      'path[0][alias]' => $manual_alias_updated,
+    );
+    $this->drupalPostForm($node->toUrl('edit-form'), $edit, t('Save and keep published'));
+    $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
+
+    // Check that the automatic alias checkbox is now unchecked by default.
+    $this->drupalGet("node/{$node->id()}/edit");
+    $this->assertNoFieldChecked('edit-path-0-pathauto');
+    // Make sure that manual alias really updated.
+    $this->assertFieldByName('path[0][alias]', $manual_alias_updated);
+
+    // Submit the node form with the default values.
+    $this->drupalPostForm(NULL, array('path[0][pathauto]' => FALSE), t('Save and keep published'));
+    $this->assertText(t('@type @title has been updated.', array('@type' => 'page', '@title' => $title)));
+
+    // Test that the node accessible through the new (manual) alias.
+    $this->drupalGet($manual_alias_updated);
+    $this->assertText($title, 'Node accessible through updated manual alias.');
+
     // Test that the manual alias is not kept for new nodes when the pathauto
     // checkbox is ticked.
     $title = 'Automatic Title';