diff --git a/tests/phpunit/tests/query/searchColumns.php b/tests/phpunit/tests/query/searchColumns.php
index 55fc32b29f..463bef8107 100644
--- a/tests/phpunit/tests/query/searchColumns.php
+++ b/tests/phpunit/tests/query/searchColumns.php
@@ -91,7 +91,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 		$this->assertStringContainsString( 'post_title', $q->request, 'SQL request should contain post_title string.' );
 		$this->assertStringContainsString( 'post_excerpt', $q->request, 'SQL request should contain post_excerpt string.' );
 		$this->assertStringContainsString( 'post_content', $q->request, 'SQL request should contain post_content string.' );
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
 	}
 
 	/**
@@ -108,7 +108,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1 ), $q->posts );
 	}
 
 	/**
@@ -125,7 +125,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1, self::$pid2 ), $q->posts );
 	}
 
 	/**
@@ -141,7 +141,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 				'fields'         => 'ids',
 			)
 		);
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
 	}
 
 	/**
@@ -158,7 +158,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1, self::$pid2 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1, self::$pid2 ), $q->posts );
 	}
 
 	/**
@@ -175,7 +175,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
 	}
 
 	/**
@@ -192,7 +192,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
 	}
 
 	/**
@@ -209,7 +209,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts );
 	}
 
 	/**
@@ -229,7 +229,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 		$this->assertStringContainsString( 'post_title', $q->request, 'SQL request should contain post_title string.' );
 		$this->assertStringContainsString( 'post_excerpt', $q->request, 'SQL request should contain post_excerpt string.' );
 		$this->assertStringContainsString( 'post_content', $q->request, 'SQL request should contain post_content string.' );
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
 	}
 
 	/**
@@ -246,7 +246,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1 ), $q->posts );
 	}
 
 	/**
@@ -263,7 +263,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
+		$this->assertSameSets( array( self::$pid2, self::$pid3 ), $q->posts );
 	}
 
 	/**
@@ -281,7 +281,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid3 ), $q->posts );
+		$this->assertSameSets( array( self::$pid3 ), $q->posts );
 	}
 
 	/**
@@ -299,7 +299,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid2, self::$pid3 ), $q->posts );
+		$this->assertSameSets( array( self::$pid2, self::$pid3 ), $q->posts );
 	}
 
 	/**
@@ -316,7 +316,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid2 ), $q->posts );
+		$this->assertSameSets( array( self::$pid2 ), $q->posts );
 	}
 
 	/**
@@ -333,7 +333,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 			)
 		);
 
-		$this->assertSame( array( self::$pid1 ), $q->posts );
+		$this->assertSameSets( array( self::$pid1 ), $q->posts );
 	}
 
 	/**
@@ -364,7 +364,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 		);
 
 		$this->assertStringNotContainsString( 'post_name', $q->request, "SQL request shouldn't contain post_name string." );
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
 	}
 
 	/**
@@ -395,7 +395,7 @@ class Tests_Query_SearchColumns extends WP_UnitTestCase {
 		);
 
 		$this->assertStringNotContainsString( 'post_non_existing_column', $q->request, "SQL request shouldn't contain post_non_existing_column string." );
-		$this->assertSame( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
+		$this->assertSameSets( array( self::$pid1, self::$pid2, self::$pid3 ), $q->posts, 'Query results should be equal to the set.' );
 	}
 
 	/**