diff --git a/core/modules/forum/src/Tests/ForumTest.php b/core/modules/forum/src/Tests/ForumTest.php
index 6feb754..68ef84b 100644
--- a/core/modules/forum/src/Tests/ForumTest.php
+++ b/core/modules/forum/src/Tests/ForumTest.php
@@ -275,7 +275,7 @@ private function doAdminTests($user) {
 
     // Add forum to the Tools menu.
     $edit = array();
-    $this->drupalPostForm('admin/structure/menu/manage/tools', $edit, t('Save'));
+    $this->drupalPostForm('admin/structure/menu/manage/tools/edit', $edit, t('Save'));
     $this->assertResponse(200);
 
     // Edit forum taxonomy.
@@ -311,7 +311,7 @@ private function doAdminTests($user) {
     $this->root_forum = $this->createForum('forum');
 
     // Test vocabulary form alterations.
-    $this->drupalGet('admin/structure/taxonomy/manage/forums');
+    $this->drupalGet('admin/structure/taxonomy/manage/forums/edit');
     $this->assertFieldByName('op', t('Save'), 'Save button found.');
     $this->assertNoFieldByName('op', t('Delete'), 'Delete button not found.');
 
@@ -332,7 +332,7 @@ private function doAdminTests($user) {
     ));
     $vocabulary->save();
     // Test tags vocabulary form is not affected.
-    $this->drupalGet('admin/structure/taxonomy/manage/tags');
+    $this->drupalGet('admin/structure/taxonomy/manage/tags/edit');
     $this->assertFieldByName('op', t('Save'), 'Save button found.');
     $this->assertLink(t('Delete'));
     // Test tags vocabulary term form is not affected.
@@ -358,7 +358,7 @@ function editForumVocabulary() {
     );
 
     // Edit the vocabulary.
-    $this->drupalPostForm('admin/structure/taxonomy/manage/' . $original_vocabulary->id(), $edit, t('Save'));
+    $this->drupalPostForm($original_vocabulary->urlInfo('edit-form'), $edit, t('Save'));
     $this->assertResponse(200);
     $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $edit['name'])), 'Vocabulary was edited');
 
diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
index f4e1378..01b9de1 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
@@ -235,7 +235,7 @@ public function testTaxonomyVocabularyUpdate() {
       'default_language[langcode]' => 'current_interface',
       'default_language[language_alterable]' => TRUE,
     );
-    $this->drupalPostForm('admin/structure/taxonomy/manage/country', $edit, t('Save'));
+    $this->drupalPostForm($vocabulary->urlInfo('edit-form'), $edit, t('Save'));
 
     // Check the language default configuration.
     $configuration = ContentLanguageSettings::loadByEntityTypeBundle('taxonomy_term', 'country');
@@ -246,7 +246,7 @@ public function testTaxonomyVocabularyUpdate() {
     $edit = array(
       'vid' => 'nation'
     );
-    $this->drupalPostForm('admin/structure/taxonomy/manage/country', $edit, t('Save'));
+    $this->drupalPostForm($vocabulary->urlInfo('edit-form'), $edit, t('Save'));
     // Check that we still have the settings for the new vocabulary.
     $configuration = ContentLanguageSettings::loadByEntityTypeBundle('taxonomy_term', 'nation');
     $this->assertEqual($configuration->getDefaultLangcode(), 'current_interface', 'The default language configuration has been kept on the new Country vocabulary.');
diff --git a/core/modules/taxonomy/src/Tests/VocabularyUiTest.php b/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
index aa24cee..d92f915 100644
--- a/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
+++ b/core/modules/taxonomy/src/Tests/VocabularyUiTest.php
@@ -143,7 +143,7 @@ function testTaxonomyAdminDeletingVocabulary() {
     $this->assertTrue($vocabulary, 'Vocabulary found.');
 
     // Delete the vocabulary.
-    $this->drupalGet('admin/structure/taxonomy/manage/' . $vocabulary->id());
+    $this->drupalGet($vocabulary->urlInfo('edit-form'));
     $this->clickLink(t('Delete'));
     $this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', array('%name' => $vocabulary->label())), '[confirm deletion] Asks for confirmation.');
     $this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), '[confirm deletion] Inform that all terms will be deleted.');