diff --git a/core/modules/filter/src/Form/FilterDisableForm.php b/core/modules/filter/src/Form/FilterDisableForm.php
index 95761b6..fc448ec 100644
--- a/core/modules/filter/src/Form/FilterDisableForm.php
+++ b/core/modules/filter/src/Form/FilterDisableForm.php
@@ -41,7 +41,7 @@ public function getConfirmText() {
    * {@inheritdoc}
    */
   public function getDescription() {
-    return $this->t('Any content stored with that format will not be displayed.');
+    return $this->t('Any content stored with this format will not be displayed.');
   }
 
   /**
diff --git a/core/modules/filter/src/Tests/FilterAdminTest.php b/core/modules/filter/src/Tests/FilterAdminTest.php
index 3066f19..2ea1474 100644
--- a/core/modules/filter/src/Tests/FilterAdminTest.php
+++ b/core/modules/filter/src/Tests/FilterAdminTest.php
@@ -159,7 +159,7 @@ function testFormatAdmin() {
 
     // Disable text format.
     $this->assertLinkByHref('admin/config/content/formats/manage/' . $format_id . '/disable');
-    $this->drupalGet('admin/config/content/formats/manage/' . $format_id . '/disable');
+    $this->clickLinkHelper(t('Disable'), 0, '//tr[./td[text()="' . $name . '"]]//a[text()="' . t('Disable') . '"]');
     $this->drupalPostForm(NULL, array(), t('Disable'));
     $this->assertUrl('admin/config/content/formats');
 
@@ -172,8 +172,6 @@ function testFormatAdmin() {
 
     $elements = $this->xpath($pattern, array(':label' => t('Disable')) + $placeholders);
     $this->assertEqual(0, count($elements), 'Disable button does not exist.');
-    $elements = $this->xpath($pattern, array(':label' => t('Configure')) + $placeholders);
-    $this->assertEqual(0, count($elements), 'Configure button does not exist.');
 
     // Verify that disabled text format no longer exists.
     $this->drupalGet('admin/config/content/formats/manage/' . $format_id);
@@ -206,7 +204,7 @@ function testFormatAdmin() {
     $this->assertRaw(t('This format has been disabled and is no longer available. Any content stored with this format will not be displayed.'));
 
     // Enable text format.
-    $this->drupalGet('admin/config/content/formats/manage/' . $format_id . '/enable');
+    $this->clickLinkHelper(t('Enable'), 0, '//tr[./td[text()="' . $name . '"]]//a[text()="' . t('Enable') . '"]');
     $this->drupalPostForm(NULL, array(), t('Enable'));
 
     // Verify that disabled text format has been enabled again.
@@ -303,7 +301,9 @@ function testFilterAdmin() {
     $this->assertFieldByName('filters[' . $first_filter . '][status]', '', 'Url filter found.');
 
     // Disable new filter.
-    $this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', array(), t('Disable'));
+    $this->drupalGet('admin/config/content/formats');
+    $this->clickLinkHelper(t('Disable'), 0, '//tr[./td[text()="' . $edit['name'] . '"]]//a[text()="' . t('Disable') . '"]');
+    $this->drupalPostForm(NULL, array(), t('Disable'));
     $this->assertUrl('admin/config/content/formats');
     $this->assertRaw(t('Disabled text format %format.', array('%format' => $edit['name'])), 'Format successfully disabled.');