diff --git a/php-polyfills.php b/php-polyfills.php
index 89d6d1a76..b3ab8ed67 100644
--- a/php-polyfills.php
+++ b/php-polyfills.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Polyfills for php 7 & 8 functions
+ * Polyfills for PHP 8.0 string functions.
+ *
+ * Implementation follows the Symfony polyfill-php80 package.
+ *
+ * @see https://github.com/symfony/polyfill-php80
  *
  * @package wp-sqlite-integration
  */
@@ -17,7 +21,7 @@
 	 * @return bool
 	 */
 	function str_starts_with( string $haystack, string $needle ) {
-		return empty( $needle ) || 0 === strpos( $haystack, $needle );
+		return 0 === strncmp( $haystack, $needle, strlen( $needle ) );
 	}
 }
 
@@ -33,7 +37,7 @@ function str_starts_with( string $haystack, string $needle ) {
 	 * @return bool
 	 */
 	function str_contains( string $haystack, string $needle ) {
-		return empty( $needle ) || false !== strpos( $haystack, $needle );
+		return '' === $needle || false !== strpos( $haystack, $needle );
 	}
 }
 
@@ -49,6 +53,16 @@ function str_contains( string $haystack, string $needle ) {
 	 * @return bool
 	 */
 	function str_ends_with( string $haystack, string $needle ) {
-		return empty( $needle ) || substr( $haystack, -strlen( $needle ) === $needle );
+		if ( '' === $needle || $needle === $haystack ) {
+			return true;
+		}
+
+		if ( '' === $haystack ) {
+			return false;
+		}
+
+		$needle_length = strlen( $needle );
+
+		return $needle_length <= strlen( $haystack ) && 0 === substr_compare( $haystack, $needle, -$needle_length );
 	}
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6f97b26e6..88217cfac 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,5 +1,6 @@
 <?php
 
+require_once __DIR__ . '/../php-polyfills.php';
 require_once __DIR__ . '/wp-sqlite-schema.php';
 require_once __DIR__ . '/../wp-pdo-mysql-on-sqlite.php';
 require_once __DIR__ . '/../wp-includes/sqlite/class-wp-sqlite-query-rewriter.php';
@@ -50,57 +51,6 @@ function apply_filters( $tag, $value, ...$args ) {
 	}
 }
 
-/**
- * Polyfills for php 7 & 8 functions
- */
-
-if ( ! function_exists( 'str_starts_with' ) ) {
-	/**
-	 * Check if a string starts with a specific substring.
-	 *
-	 * @param string $haystack The string to search in.
-	 * @param string $needle The string to search for.
-	 *
-	 * @see https://www.php.net/manual/en/function.str-starts-with
-	 *
-	 * @return bool
-	 */
-	function str_starts_with( string $haystack, string $needle ) {
-		return empty( $needle ) || 0 === strpos( $haystack, $needle );
-	}
-}
-
-if ( ! function_exists( 'str_contains' ) ) {
-	/**
-	 * Check if a string contains a specific substring.
-	 *
-	 * @param string $haystack The string to search in.
-	 * @param string $needle The string to search for.
-	 *
-	 * @see https://www.php.net/manual/en/function.str-contains
-	 *
-	 * @return bool
-	 */
-	function str_contains( string $haystack, string $needle ) {
-		return empty( $needle ) || false !== strpos( $haystack, $needle );
-	}
-}
-
-if ( ! function_exists( 'str_ends_with' ) ) {
-	/**
-	 * Check if a string ends with a specific substring.
-	 *
-	 * @param string $haystack The string to search in.
-	 * @param string $needle The string to search for.
-	 *
-	 * @see https://www.php.net/manual/en/function.str-ends-with
-	 *
-	 * @return bool
-	 */
-	function str_ends_with( string $haystack, string $needle ) {
-		return empty( $needle ) || substr( $haystack, -strlen( $needle ) ) === $needle;
-	}
-}
 if ( extension_loaded( 'mbstring' ) ) {
 
 	if ( ! function_exists( 'mb_str_starts_with' ) ) {