diff --git a/core/modules/taxonomy/taxonomy.test b/core/modules/taxonomy/taxonomy.test
index 3e6301a..bc24e5f 100644
--- a/core/modules/taxonomy/taxonomy.test
+++ b/core/modules/taxonomy/taxonomy.test
@@ -576,8 +590,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
     // Enable tags in the vocabulary.
     $instance = $this->instance;
     $instance['widget'] = array('type' => 'taxonomy_autocomplete');
-    $instance['bundle'] = 'page';
-    field_create_instance($instance);
+    field_update_instance($instance);
     $terms = array(
       $this->randomName(),
       $this->randomName() . ', ' . $this->randomName(),
@@ -593,7 +606,7 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
     $edit[$instance['field_name'] . "[$langcode]"] = drupal_implode_tags($terms);
 
     // Preview and verify the terms appear but are not created.
-    $this->drupalPost('node/add/page', $edit, t('Preview'));
+    $this->drupalPost('node/add/article', $edit, t('Preview'));
     foreach ($terms as $term) {
       $this->assertText($term, t('The term appears on the node preview'));
     }
@@ -601,11 +614,11 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
     $this->assertTrue(empty($tree), t('The terms are not created on preview.'));
 
     // taxonomy.module does not maintain its static caches.
-    drupal_static_reset();
+    taxonomy_terms_static_reset();
 
     // Save, creating the terms.
-    $this->drupalPost('node/add/page', $edit, t('Save'));
-    $this->assertRaw(t('@type %title has been created.', array('@type' => t('Basic page'), '%title' => $edit["title"])), t('The node was created successfully'));
+    $this->drupalPost('node/add/article', $edit, t('Save'));
+    $this->assertRaw(t('@type %title has been created.', array('@type' => t('Article'), '%title' => $edit["title"])), t('The node was created successfully'));
     foreach ($terms as $term) {
       $this->assertText($term, t('The term was saved and appears on the node page'));
     }
@@ -630,14 +643,14 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
     // Test autocomplete on term 2, which contains a comma.
     // The term will be quoted, and the " will be encoded in unicode (\u0022).
     $input = substr($term2->name, 0, 3);
-    $this->drupalGet('taxonomy/autocomplete/taxonomy_' . $this->vocabulary->machine_name . '/' . $input);
-    $this->assertRaw('{"\u0022' . $term2->name . '\u0022":"' . $term2->name . '"}', t('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term2->name)));
+    $out = $this->drupalGet('taxonomy/autocomplete/taxonomy_' . $this->vocabulary->machine_name . '/' . $input);
+    $this->assertEqual($out, '{"\u0022' . $term2->name . '\u0022":"' . $term2->name . '"}');
 
     // Test autocomplete on term 3 - it is alphanumeric only, so no extra
     // quoting.
     $input = substr($term3->name, 0, 3);
-    $this->drupalGet('taxonomy/autocomplete/taxonomy_' . $this->vocabulary->machine_name . '/' . $input);
-    $this->assertRaw('{"' . $term3->name . '":"' . $term3->name . '"}', t('Autocomplete returns term %term_name after typing the first 3 letters.', array('%term_name' => $term3->name)));
+    $out = $this->drupalGet('taxonomy/autocomplete/taxonomy_' . $this->vocabulary->machine_name . '/' . $input);
+    $this->assertEqual($out, '{"' . $term3->name . '":"' . $term3->name . '"}');
   }
 
   /**