Index: tests/phpunit/tests/option/siteOption.php
===================================================================
--- tests/phpunit/tests/option/siteOption.php	(revision 33701)
+++ tests/phpunit/tests/option/siteOption.php	(working copy)
@@ -78,7 +78,7 @@
 
 		delete_site_option( $key );
 		$this->assertTrue( update_site_option( $key, $value ) );
-		wp_cache_flush(); // ensure we're getting the value from the DB
+		$this->flush_cache(); // ensure we're getting the value from the DB
 		$this->assertEquals( $value, get_site_option( $key ) );
 	}
 
Index: tests/phpunit/tests/option/updateOption.php
===================================================================
--- tests/phpunit/tests/option/updateOption.php	(revision 33703)
+++ tests/phpunit/tests/option/updateOption.php	(working copy)
@@ -25,9 +25,9 @@
 		}
 
 		global $wpdb;
-		wp_cache_flush();
+		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value' );
-		wp_cache_flush();
+		$this->flush_cache();
 
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
@@ -49,9 +49,9 @@
 		}
 
 		global $wpdb;
-		wp_cache_flush();
+		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value', 'yes' );
-		wp_cache_flush();
+		$this->flush_cache();
 
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
@@ -73,9 +73,9 @@
 		}
 
 		global $wpdb;
-		wp_cache_flush();
+		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value', 'no' );
-		wp_cache_flush();
+		$this->flush_cache();
 
 		// Populate the alloptions cache, which does not include autoload=no options.
 		wp_load_alloptions();
@@ -98,9 +98,9 @@
 		}
 
 		global $wpdb;
-		wp_cache_flush();
+		$this->flush_cache();
 		update_option( 'test_update_option_default', 'value', false );
-		wp_cache_flush();
+		$this->flush_cache();
 
 		// Populate the alloptions cache, which does not include autoload=no options.
 		wp_load_alloptions();
@@ -127,7 +127,7 @@
 		$updated = update_option( 'foo', 'bar2', true );
 		$this->assertTrue( $updated );
 
-		wp_cache_flush();
+		$this->flush_cache();
 
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
@@ -152,7 +152,7 @@
 		$updated = update_option( 'foo', 'bar', false );
 		$this->assertFalse( $updated );
 
-		wp_cache_flush();
+		$this->flush_cache();
 
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();
@@ -180,7 +180,7 @@
 		$updated = update_option( 'foo', 'bar2' );
 		$this->assertTrue( $updated );
 
-		wp_cache_flush();
+		$this->flush_cache();
 
 		// Populate the alloptions cache, which includes autoload=yes options.
 		wp_load_alloptions();