diff --git tests/phpunit/tests/theme.php tests/phpunit/tests/theme.php
index a9136d1..2e76f7c 100644
--- tests/phpunit/tests/theme.php
+++ tests/phpunit/tests/theme.php
@@ -302,7 +302,7 @@ class Tests_Theme extends WP_UnitTestCase {
 
 		$theme = wp_get_theme();
 		$this->assertEquals( $style, (string) $theme );
-		$this->assertNotSame( false, $theme->errors() );
+		$this->assertNotFalse( $theme->errors() );
 		$this->assertFalse( $theme->exists() );
 
 		// these return the bogus name - perhaps not ideal behaviour?
diff --git tests/phpunit/tests/theme/support.php tests/phpunit/tests/theme/support.php
index 648f031..9b7eb24 100644
--- tests/phpunit/tests/theme/support.php
+++ tests/phpunit/tests/theme/support.php
@@ -90,7 +90,7 @@ class Tests_Theme_Support extends WP_UnitTestCase {
 		remove_theme_support( 'html5' );
 		$this->assertFalse( current_theme_supports( 'html5' ) );
 		$this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
-		$this->assertNotSame( false, add_theme_support( 'html5' ) );
+		$this->assertNotFalse( add_theme_support( 'html5' ) );
 		$this->assertTrue( current_theme_supports( 'html5' ) );
 		$this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
 		$this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
@@ -108,7 +108,7 @@ class Tests_Theme_Support extends WP_UnitTestCase {
 		$this->assertFalse( current_theme_supports( 'html5' ) );
 		$this->assertFalse( current_theme_supports( 'html5', 'comment-form' ) );
 		$this->assertFalse( add_theme_support( 'html5', 'comment-form' ) );
-		$this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-form' ) ) );
+		$this->assertNotFalse( add_theme_support( 'html5', array( 'comment-form' ) ) );
 		$this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
 
 		// This will return true, which might help a plugin author decide what markup to serve,
@@ -117,7 +117,7 @@ class Tests_Theme_Support extends WP_UnitTestCase {
 
 		// It appends, rather than replaces.
 		$this->assertFalse( current_theme_supports( 'html5', 'comment-list' ) );
-		$this->assertNotSame( false, add_theme_support( 'html5', array( 'comment-list' ) ) );
+		$this->assertNotFalse( add_theme_support( 'html5', array( 'comment-list' ) ) );
 		$this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
 		$this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
 		$this->assertFalse( current_theme_supports( 'html5', 'search-form' ) );