diff --git a/includes/abstract/feedzy-rss-feeds-admin-abstract.php b/includes/abstract/feedzy-rss-feeds-admin-abstract.php
index 2cc5d0a4..ff0e0537 100644
--- a/includes/abstract/feedzy-rss-feeds-admin-abstract.php
+++ b/includes/abstract/feedzy-rss-feeds-admin-abstract.php
@@ -858,7 +858,7 @@ private function init_feed( $feed_url, $cache, $sc, $allow_https = FEEDZY_ALLOW_
 		require_once ABSPATH . WPINC . '/class-wp-feed-cache-transient.php';
 		require_once ABSPATH . WPINC . '/class-wp-simplepie-file.php';
 
-		$feed->set_file_class( 'WP_SimplePie_File' );
+		$feed->get_registry()->register( SimplePie\File::class, 'WP_SimplePie_File', true );
 		$default_agent = $this->get_default_user_agent( $feed_url );
 		$feed->set_useragent( apply_filters( 'http_headers_useragent', $default_agent ) );
 		if ( false === apply_filters( 'feedzy_disable_db_cache', false, $feed_url ) ) {
diff --git a/tests/e2e/specs/classic-block.spec.js b/tests/e2e/specs/classic-block.spec.js
index 17733bce..991480ab 100644
--- a/tests/e2e/specs/classic-block.spec.js
+++ b/tests/e2e/specs/classic-block.spec.js
@@ -21,7 +21,7 @@ test.describe('Feedzy Classic Block', () => {
 
 		await page.getByRole('button', { name: 'Load Feed' }).click();
 
-		await page.waitForSelector('.feedzy-validation-results');
+		await page.waitForSelector('.feedzy-validation-results', { timeout: 30000 });
 
 		await expect(
 			page
@@ -49,7 +49,7 @@ test.describe('Feedzy Classic Block', () => {
 
 		await page.getByRole('button', { name: 'Load Feed' }).click();
 
-		await page.waitForSelector('.feedzy-validation-results');
+		await page.waitForSelector('.feedzy-validation-results', { timeout: 30000 });
 
 		await expect(
 			page
diff --git a/tests/e2e/specs/loop.spec.js b/tests/e2e/specs/loop.spec.js
index 358b37ac..e7f1c72c 100644
--- a/tests/e2e/specs/loop.spec.js
+++ b/tests/e2e/specs/loop.spec.js
@@ -119,7 +119,7 @@ test.describe('Feedzy Loop', () => {
 			.fill('http://invalid-url.com/feed');
 		await page.getByRole('button', { name: 'Load Feed' }).click();
 
-		await page.waitForSelector('.feedzy-validation-results');
+		await page.waitForSelector('.feedzy-validation-results', { timeout: 30000 });
 
 		await expect(
 			page
@@ -146,7 +146,7 @@ test.describe('Feedzy Loop', () => {
 			);
 		await page.getByRole('button', { name: 'Load Feed' }).click();
 
-		await page.waitForSelector('.feedzy-validation-results');
+		await page.waitForSelector('.feedzy-validation-results', { timeout: 30000 });
 
 		await expect(
 			page