Index: tests/phpunit/tests/term/cache.php
===================================================================
--- tests/phpunit/tests/term/cache.php	(revision 27218)
+++ tests/phpunit/tests/term/cache.php	(working copy)
@@ -17,6 +17,10 @@
 		// Test with only one Parent => Child
 		$term_id1 = $this->factory->category->create();
 		$term_id1_child = $this->factory->category->create( array( 'parent' => $term_id1 ) );
+
+		$term_ids = array( $term_id1, $term_id1_child );
+		clean_term_cache( $term_ids, 'category' );
+
 		$hierarchy = _get_term_hierarchy( 'category' );
 
 		$this->assertEquals( array( $term_id1 => array( $term_id1_child ) ), $hierarchy );
@@ -24,6 +28,10 @@
 		// Add another Parent => Child
 		$term_id2 = $this->factory->category->create();
 		$term_id2_child = $this->factory->category->create( array( 'parent' => $term_id2 ) );
+
+		$term_ids = array( $term_id2, $term_id2_child );
+		clean_term_cache( $term_ids, 'category' );
+
 		$hierarchy = _get_term_hierarchy( 'category' );
 
 		$this->assertEquals( array( $term_id1 => array( $term_id1_child ), $term_id2 => array( $term_id2_child ) ), $hierarchy );
@@ -76,6 +84,8 @@
 				break;
 			}
 
+			clean_term_cache( $parent_id, $tax );
+
 			$terms = get_terms( $tax, array( 'hide_empty' => false ) );
 			$this->assertEquals( $i, count( $terms ) );
 			if ( $i > 1 ) {
Index: tests/phpunit/tests/term/getTerms.php
===================================================================
--- tests/phpunit/tests/term/getTerms.php	(revision 27218)
+++ tests/phpunit/tests/term/getTerms.php	(working copy)
@@ -165,8 +165,8 @@
 		$term_id2 = $this->factory->category->create();
 		$term_id22 = $this->factory->category->create( array( 'parent' => $term_id2 ) );
 
-		// There's something else broken in the cache cleaning routines that leads to this having to be done manually
-		delete_option( 'category_children' );
+		$term_ids = array( $term_id1, $term_id11, $term_id2, $term_id22 );
+		clean_term_cache( $term_ids, 'category' );
 
 		$terms = get_terms( 'category', array(
 			'exclude' => $term_id_uncategorized,
@@ -275,6 +275,9 @@
 		$fruit = $this->factory->term->create( array( 'name' => 'Fruit', 'taxonomy' => $tax ) );
 		$cranberries = $this->factory->term->create( array( 'name' => 'Cranberries', 'parent' => $fruit, 'taxonomy' => $tax ) );
 
+		$term_ids = array( $cheese, $cheddar, $brie, $crackers, $butter, $multigrain, $fruit, $cranberries );
+		clean_term_cache( $term_ids, $tax );
+
 		$terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
 		$this->assertNotEmpty( $terms );
 		$this->assertEquals( wp_list_pluck( $terms, 'name' ), array( 'Cheese', 'Crackers' ) );
@@ -295,6 +298,9 @@
 		$term = get_term( $spread, $tax );
 		$this->assertEquals( 1, $term->count );
 
+		$term_ids = array( $cheese, $cheddar, $spread );
+		clean_term_cache( $term_ids, $tax );
+
 		$terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
 		$this->assertNotEmpty( $terms );
 		$this->assertEquals( array( 'Cheese' ), wp_list_pluck( $terms, 'name' ) );
@@ -319,6 +325,8 @@
 		$term = get_term( $t[7], $tax );
 		$this->assertEquals( 1, $term->count );
 
+		clean_term_cache( $t, $tax );
+
 		$terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
 		$this->assertNotEmpty( $terms );
 		$this->assertEquals( array( 'term1' ), wp_list_pluck( $terms, 'name' ) );