diff --git a/api.wordpress.org/public_html/patterns/1.0/tests/test-index.php b/api.wordpress.org/public_html/patterns/1.0/tests/test-index.php
index 180ff21f9b..d690a85018 100644
--- a/api.wordpress.org/public_html/patterns/1.0/tests/test-index.php
+++ b/api.wordpress.org/public_html/patterns/1.0/tests/test-index.php
@@ -9,7 +9,7 @@
  */
 class Test_Patterns extends TestCase {
 	/**
-	 * Asserts that an HTTP response is valid and contains a pattern.
+	 * Asserts that an HTTP response is valid and contains items matching the pattern format.
 	 *
 	 * @param Requests_Response $response
 	 */
@@ -19,10 +19,12 @@ public function assertResponseHasPattern( $response ) {
 		$patterns = json_decode( $response->body );
 		$this->assertIsArray( $patterns );
 		$this->assertGreaterThan( 0, count( $patterns ) );
-		$this->assertIsString( $patterns[0]->title->rendered );
-		$this->assertIsInt( $patterns[0]->meta->wpop_viewport_width );
-		$this->assertIsArray( $patterns[0]->category_slugs );
-		$this->assertIsArray( $patterns[0]->keyword_slugs );
+		foreach ( $patterns as $pattern ) {
+			$this->assertIsString( $pattern->title->rendered );
+			$this->assertIsInt( $pattern->meta->wpop_viewport_width );
+			$this->assertIsArray( $pattern->category_slugs );
+			$this->assertIsArray( $pattern->keyword_slugs );
+		}
 	}
 
 	/**
@@ -81,19 +83,12 @@ public function get_term_slugs( $patterns ) {
 	 * @group e2e
 	 */
 	public function test_browse_all_patterns() : void {
-		$response = send_request( '/patterns/1.0/?per_page=100' );
+		$response = send_request( '/patterns/1.0/?per_page=20' );
 		$this->assertResponseHasPattern( $response );
 
-		// When all locales and keywords are included, there should be at least 100 patterns.
+		// When all locales and keywords are included, there should be at least 20 patterns.
 		$patterns = json_decode( $response->body );
-		$this->assertSame( 100, count( $patterns ) );
-
-		/*
-		 * The exact number of unique categories will vary based on which cohort of pattens happen to be returned,
-		 * but `3` seems like a safe minimum in practice.
-		 */
-		$term_slugs = $this->get_term_slugs( $patterns );
-		$this->assertGreaterThan( 3, count( $term_slugs ) );
+		$this->assertSame( 20, count( $patterns ) );
 	}
 
 	/**
@@ -108,7 +103,7 @@ public function test_browse_patterns_by_category() : void {
 		 * This can't include a `pattern-keyword` param because of the workaround in
 		 * `WordPressdotorg\Pattern_Directory\Pattern_Post_Type\register_rest_fields()`.
 		 */
-		$response = send_request( '/patterns/1.0/?pattern-categories=' . $button_term_id . '&locale=en_US' );
+		$response = send_request( '/patterns/1.0/?per_page=20&pattern-categories=' . $button_term_id . '&locale=en_US' );
 		$this->assertResponseHasPattern( $response );
 
 		$patterns   = json_decode( $response->body );
@@ -260,7 +255,7 @@ public function data_search_patterns() {
 
 			// The Core keyword (11) is hardcoded in `test_search_patterns()`, so don't need to specify it here.
 			"only match Core posts" => array(
-				'search_term'       => 'two buttons', // Post ID 727.
+				'search_term'       => 'Two images with text and buttons', // Post ID 727.
 				'locale'            => 'en_US',
 				'match_expected'    => false,
 				'expected_post_ids' => false,
@@ -297,7 +292,7 @@ public function data_search_patterns() {
 	 * @group e2e
 	 */
 	public function test_search_title_match_boosted_above_description_match() : void {
-		$search_term = 'image';
+		$search_term = 'heading';
 		$locale      = 'en_US';
 
 		$response = send_request( "/patterns/1.0/?search=$search_term&pattern-keywords=11&locale=$locale" );
@@ -314,8 +309,8 @@ public function test_search_title_match_boosted_above_description_match() : void
 
 		usort( $expectedPatterns, function( $a, $b ) use ( $search_term ) {
 			$adjustment       = 0;
-			$found_in_title_a = false === stripos( $search_term, $a->title->rendered );
-			$found_in_title_b = false === stripos( $search_term, $b->title->rendered );
+			$found_in_title_a = false !== stripos( $search_term, $a->title->rendered );
+			$found_in_title_b = false !== stripos( $search_term, $b->title->rendered );
 
 			if ( $found_in_title_a && ! $found_in_title_b ) {
 				$adjustment = -1;
@@ -347,7 +342,9 @@ public function test_search_locale_sort() : void {
 
 		$this->assertAllPatternsMatchSearchTerm( $patterns, $search_term );
 
-		$this->markTestIncomplete(); // todo the following code works, but `WordPressdotorg\Pattern_Directory\Search\modify_es_query_args` isn't boosting the primary locale yet
+		// The following test works, but `WordPressdotorg\Pattern_Directory\Search\modify_es_query_args` isn't boosting the primary locale yet.
+		// See https://github.com/WordPress/pattern-directory/issues/347
+		$this->markTestIncomplete();
 
 		$actualOrder = array_column( array_column( $patterns, 'meta' ), 'wpop_locale'  );