diff --git a/tests/php/unit/Configuration/configuration-test.php b/tests/php/unit/Configuration/configuration-test.php
index fca519ae..6fff3aec 100644
--- a/tests/php/unit/Configuration/configuration-test.php
+++ b/tests/php/unit/Configuration/configuration-test.php
@@ -60,7 +60,7 @@ public function testEmpty() {
 			$configuration->to_array()
 		);
 
-		$this->assertEquals( Filters\applied( 'acf/get_info' ), 1 );
+		$this->assertSame( Filters\applied( 'acf/get_info' ), 1 );
 	}
 
 	/**
@@ -79,7 +79,7 @@ public function testACF5VersionFunction() {
 		);
 		$config        = $configuration->to_array();
 
-		$this->assertEquals( $acf_version, $config['acfVersion'] );
+		$this->assertSame( $acf_version, $config['acfVersion'] );
 	}
 
 	/**
diff --git a/tests/php/unit/Configuration/string-store-test.php b/tests/php/unit/Configuration/string-store-test.php
index 83e4cf53..3ebe3531 100644
--- a/tests/php/unit/Configuration/string-store-test.php
+++ b/tests/php/unit/Configuration/string-store-test.php
@@ -24,8 +24,11 @@ protected function getStore() {
 	 * @return void
 	 */
 	public function testEmpty() {
-		$store = $this->getStore();
-		$this->assertEmpty( $store->to_array() );
+		$store  = $this->getStore();
+		$result = $store->to_array();
+
+		$this->assertInternalType( 'array', $result );
+		$this->assertEmpty( $result );
 	}
 
 	/**
@@ -103,7 +106,11 @@ public function testAddNonString() {
 		$store = $this->getStore();
 
 		$this->assertFalse( $store->add( 999 ) );
-		$this->assertEmpty( $store->to_array() );
+
+		$result = $store->to_array();
+
+		$this->assertInternalType( 'array', $result );
+		$this->assertEmpty( $result );
 	}
 
 	/**
@@ -129,7 +136,10 @@ public function testRemove() {
 
 		$store->remove( $type_b );
 
-		$this->assertEmpty( $store->to_array() );
+		$result = $store->to_array();
+
+		$this->assertInternalType( 'array', $result );
+		$this->assertEmpty( $result );
 	}
 
 	/**
diff --git a/tests/php/unit/main-test.php b/tests/php/unit/main-test.php
index e078126f..8b0873d5 100644
--- a/tests/php/unit/main-test.php
+++ b/tests/php/unit/main-test.php
@@ -43,7 +43,9 @@ public function testInvalidConfig() {
 		$testee = new \AC_Yoast_SEO_ACF_Content_Analysis();
 		$testee->boot();
 
-		$this->assertNotSame( 'Invalid Config', $registry->get( 'config' ) );
-		$this->assertInstanceOf( \Yoast_ACF_Analysis_Configuration::class, $registry->get( 'config' ) );
+		$result = $registry->get( 'config' );
+
+		$this->assertNotSame( 'Invalid Config', $result );
+		$this->assertInstanceOf( \Yoast_ACF_Analysis_Configuration::class, $result );
 	}
 }