diff --git a/tests/phpunit/tests/customize/custom-css-setting.php b/tests/phpunit/tests/customize/custom-css-setting.php
index 3618a288d6..43fb1111d2 100644
--- a/tests/phpunit/tests/customize/custom-css-setting.php
+++ b/tests/phpunit/tests/customize/custom-css-setting.php
@@ -380,6 +380,6 @@ class Test_WP_Customize_Custom_CSS_Setting extends WP_UnitTestCase {
 		// Check for markup.
 		$unclosed_comment = $basic_css . '</style>';
 		$result           = $this->setting->validate( $unclosed_comment );
-		$this->assertTrue( array_key_exists( 'illegal_markup', $result->errors ) );
+		$this->assertArrayHasKey( 'illegal_markup', $result->errors );
 	}
 }
diff --git a/tests/phpunit/tests/post/revisions.php b/tests/phpunit/tests/post/revisions.php
index 678290ad6c..ef44af5679 100644
--- a/tests/phpunit/tests/post/revisions.php
+++ b/tests/phpunit/tests/post/revisions.php
@@ -623,6 +623,7 @@ class Tests_Post_Revisions extends WP_UnitTestCase {
 				return $generic;
 			}
 		);
+
 		$this->assertSame( $generic, wp_revisions_to_keep( $post ) );
 
 		$expected = $generic + 1;
@@ -633,6 +634,7 @@ class Tests_Post_Revisions extends WP_UnitTestCase {
 				return $expected;
 			}
 		);
+
 		$this->assertSame( $expected, wp_revisions_to_keep( $post ) );
 	}
 
@@ -642,12 +644,14 @@ class Tests_Post_Revisions extends WP_UnitTestCase {
 	 * @ticket 30009
 	 */
 	public function test_wp_save_post_revision_error() {
-		$post     = self::factory()->post->create_and_get(
+		$post = self::factory()->post->create_and_get(
 			array(
 				'ID' => PHP_INT_MAX,
 			)
 		);
+
 		$revision = _wp_put_post_revision( $post );
-		$this->assertTrue( is_wp_error( $revision ) );
+
+		$this->assertWPError( $revision );
 	}
 }
diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
index cd1878e0aa..5a23431697 100644
--- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php
+++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php
@@ -157,8 +157,8 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
 		switch_theme( 'fse' );
 		$fse = WP_Theme_JSON_Resolver::theme_has_support();
 
-		$this->assertSame( false, $default );
-		$this->assertSame( true, $fse );
+		$this->assertFalse( $default );
+		$this->assertTrue( $fse );
 	}
 
 }
diff --git a/tests/phpunit/tests/user/query.php b/tests/phpunit/tests/user/query.php
index 8db016b6de..6f8f6f0e73 100644
--- a/tests/phpunit/tests/user/query.php
+++ b/tests/phpunit/tests/user/query.php
@@ -1296,7 +1296,7 @@ class Tests_User_Query extends WP_UnitTestCase {
 		remove_action( 'pre_get_users', array( $this, 'filter_pre_get_users_args' ) );
 
 		foreach ( $query_vars as $query_var ) {
-			$this->assertTrue( array_key_exists( $query_var, $q->query_vars ), "$query_var does not exist." );
+			$this->assertArrayHasKey( $query_var, $q->query_vars, "$query_var does not exist." );
 		}
 
 	}