diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm
index 2eaca0114e9f..6fa81f227f1a 100644
--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm
+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PushAPI.mm
@@ -506,24 +506,15 @@ - (void)dealloc
 
 static void terminateNetworkProcessWhileRegistrationIsStored(WKWebViewConfiguration *configuration)
 {
-    auto path = configuration.websiteDataStore._configuration._serviceWorkerRegistrationDirectory.path;
-    NSURL* directory = [NSURL fileURLWithPath:path isDirectory:YES];
-    auto filename = makeString("ServiceWorkerRegistrations-"_s, WebCore::SWRegistrationDatabase::schemaVersion, ".sqlite3");
-    NSURL *swDBPath = [directory URLByAppendingPathComponent:filename];
-    unsigned timeout = 0;
-    while (![[NSFileManager defaultManager] fileExistsAtPath:swDBPath.path] && ++timeout < 100)
-        TestWebKitAPI::Util::runFor(0.1_s);
-    // Let's close the SQL database.
-    [configuration.websiteDataStore _sendNetworkProcessWillSuspendImminently];
+    done = false;
+    [configuration.websiteDataStore _storeServiceWorkerRegistrations:^{
+        done = true;
+    }];
+    TestWebKitAPI::Util::run(&done);
     [configuration.websiteDataStore _terminateNetworkProcess];
 }
 
-// FIXME when rdar://109725221 is resolved
-#if PLATFORM(IOS)
-TEST(PushAPI, DISABLED_firePushEventWithNoPagesSuccessful)
-#else
 TEST(PushAPI, firePushEventWithNoPagesSuccessful)
-#endif
 {
     TestWebKitAPI::HTTPServer server({
         { "/"_s, { mainBytes } },
@@ -571,12 +562,7 @@ static void terminateNetworkProcessWhileRegistrationIsStored(WKWebViewConfigurat
     clearWebsiteDataStore([configuration websiteDataStore]);
 }
 
-// FIXME when rdar://109725221 is resolved
-#if PLATFORM(IOS)
-TEST(PushAPI, DISABLED_firePushEventWithNoPagesFail)
-#else
 TEST(PushAPI, firePushEventWithNoPagesFail)
-#endif
 {
     TestWebKitAPI::HTTPServer server({
         { "/"_s, { mainBytes } },
@@ -622,11 +608,8 @@ static void terminateNetworkProcessWhileRegistrationIsStored(WKWebViewConfigurat
 
     clearWebsiteDataStore([configuration websiteDataStore]);
 }
-#if PLATFORM(IOS)
-TEST(PushAPI, DISABLED_firePushEventWithNoPagesTimeout)
-#else
+
 TEST(PushAPI, firePushEventWithNoPagesTimeout)
-#endif
 {
     TestWebKitAPI::HTTPServer server({
         { "/"_s, { mainBytes } },