diff --git a/testing/web-platform/meta/service-workers/cache-storage/common.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/common.https.html.ini
new file mode 100644
index 00000000000..8466a75c971
--- /dev/null
+++ b/testing/web-platform/meta/service-workers/cache-storage/common.https.html.ini
@@ -0,0 +1,3 @@
+[common.https.html]
+  type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
diff --git a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini
index 77d8ed8f993..08b9373c2e2 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-add.https.html.ini
@@ -1,5 +1,6 @@
 [cache-add.https.html]
   type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.add and Cache.addAll]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini
index 752482dc8ed..0cc08ec632d 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-delete.https.html.ini
@@ -1,5 +1,6 @@
 [cache-delete.https.html]
   type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.delete]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini
index 9381c0e2454..881ea327750 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-match.https.html.ini
@@ -1,5 +1,6 @@
 [cache-match.https.html]
   type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.match and Cache.matchAll]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini
index 5eadc3a1f4c..9a999e8e491 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-put.https.html.ini
@@ -1,5 +1,6 @@
 [cache-put.https.html]
   type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.put]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini
index 3b1901841e2..f56fd4fd627 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage-match.https.html.ini
@@ -1,5 +1,6 @@
 [cache-storage-match.https.html]
   type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [CacheStorage.match]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini
index d6b8f22d857..b28a1ba8538 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/serviceworker/cache-storage.https.html.ini
@@ -1,5 +1,6 @@
 [cache-storage.https.html]
   type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [CacheStorage]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini
index ceff25587cb..04e50b5e43e 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-add.https.html.ini
@@ -1,7 +1,6 @@
 [cache-add.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.add called with Request object]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini
index fa1703f11e6..def76e57518 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-delete.https.html.ini
@@ -1,7 +1,6 @@
 [cache-delete.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.delete called with a Request object]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
index 34823c7b4b2..44ec94d2311 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-match.https.html.ini
@@ -1,6 +1,6 @@
 [cache-match.https.html]
   type: testharness
-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154975
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   expected:
     if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if not debug and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini
index 3f0cf5bfa86..a8a7594beba 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-put.https.html.ini
@@ -1,7 +1,6 @@
 [cache-put.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.put with Request containing a body]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini
index ba18f6bfc2c..a1edd60d83a 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage-match.https.html.ini
@@ -1,7 +1,6 @@
 [cache-storage-match.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [CacheStorageMatch with no caches available but name provided]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini
index 9507f933581..5564c5f5036 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/cache-storage.https.html.ini
@@ -1,7 +1,6 @@
 [cache-storage.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [CacheStorage.open with existing cache]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini
index 47251881fc3..1447c318b8a 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/window/sandboxed-iframes.https.html.ini
@@ -1,5 +1,6 @@
 [sandboxed-iframes.https.html]
   type: testharness
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   expected: ERROR
   [Sandboxed iframe without allow-same-origin is denied access]
     expected: FAIL
diff --git a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini
index ceff25587cb..04e50b5e43e 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-add.https.html.ini
@@ -1,7 +1,6 @@
 [cache-add.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.add called with Request object]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini
index fa1703f11e6..def76e57518 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-delete.https.html.ini
@@ -1,7 +1,6 @@
 [cache-delete.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.delete called with a Request object]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
index b5bc545be24..327fe4f76fd 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-match.https.html.ini
@@ -1,6 +1,6 @@
 [cache-match.https.html]
   type: testharness
-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154975
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   expected:
     if not debug and (os == "win") and (version == "6.2.9200") and (processor == "x86_64") and (bits == 64): TIMEOUT
   [Cache.matchAll with no matching entries]
diff --git a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini
index 3f0cf5bfa86..a8a7594beba 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-put.https.html.ini
@@ -1,7 +1,6 @@
 [cache-put.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [Cache.put with Request containing a body]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini
index ba18f6bfc2c..a1edd60d83a 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage-match.https.html.ini
@@ -1,7 +1,6 @@
 [cache-storage-match.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [CacheStorageMatch with no caches available but name provided]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini
index 6a0b3f95c86..e200d452ff3 100644
--- a/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini
+++ b/testing/web-platform/meta/service-workers/cache-storage/worker/cache-storage.https.html.ini
@@ -1,7 +1,6 @@
 [cache-storage.https.html]
   type: testharness
-  disabled:
-    if os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1153470
+  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1154325
   [CacheStorage.open with existing cache]
     expected: FAIL