diff --git a/testing/web-platform/meta/app-history/app-history-entry/after-detach.html.ini b/testing/web-platform/meta/app-history/app-history-entry/after-detach.html.ini
index 771bf2c96936..2bd1bba9a922 100644
--- a/testing/web-platform/meta/app-history/app-history-entry/after-detach.html.ini
+++ b/testing/web-platform/meta/app-history/app-history-entry/after-detach.html.ini
@@ -1,3 +1,6 @@
 [after-detach.html]
   [AppHistoryEntry attributes after detach]
     expected: FAIL
+
+  [appHistory.current/entries()/canGoBack/canGoForward after iframe removal]
+    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/app-history-entry/current-after-detach.html.ini b/testing/web-platform/meta/app-history/app-history-entry/current-after-detach.html.ini
deleted file mode 100644
index cc5daaaef6bf..000000000000
--- a/testing/web-platform/meta/app-history/app-history-entry/current-after-detach.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[current-after-detach.html]
-  [appHistory.current should be null after iframe removal]
-    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/app-history-entry/entries-after-data-url-navigation.html.ini b/testing/web-platform/meta/app-history/app-history-entry/entries-after-data-url-navigation.html.ini
deleted file mode 100644
index bfc723061ac8..000000000000
--- a/testing/web-platform/meta/app-history/app-history-entry/entries-after-data-url-navigation.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[entries-after-data-url-navigation.html]
-  [AppHistory behavior after navigation to a data: url]
-    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/app-history-entry/entry-after-detach.html.ini b/testing/web-platform/meta/app-history/app-history-entry/entry-after-detach.html.ini
new file mode 100644
index 000000000000..782a062a4d66
--- /dev/null
+++ b/testing/web-platform/meta/app-history/app-history-entry/entry-after-detach.html.ini
@@ -0,0 +1,3 @@
+[entry-after-detach.html]
+  [AppHistoryEntry attributes after detach]
+    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/app-history-entry/opaque-origin-data-url.html.ini b/testing/web-platform/meta/app-history/app-history-entry/opaque-origin-data-url.html.ini
new file mode 100644
index 000000000000..50dae69ad378
--- /dev/null
+++ b/testing/web-platform/meta/app-history/app-history-entry/opaque-origin-data-url.html.ini
@@ -0,0 +1,4 @@
+[opaque-origin-data-url.html]
+  expected: TIMEOUT
+  [AppHistory behavior after navigation to a data: URL (which has an opaque origin)]
+    expected: TIMEOUT
diff --git a/testing/web-platform/meta/app-history/app-history-entry/opaque-origin.html.ini b/testing/web-platform/meta/app-history/app-history-entry/opaque-origin.html.ini
new file mode 100644
index 000000000000..f26eae4c8515
--- /dev/null
+++ b/testing/web-platform/meta/app-history/app-history-entry/opaque-origin.html.ini
@@ -0,0 +1,3 @@
+[opaque-origin.html]
+  [appHistory.current/entries()/canGoBack/canGoForward in an opaque origin iframe]
+    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/currentchange-event/currentchange-navigate-from-initial-about-blank-same-doc-popup.html.ini b/testing/web-platform/meta/app-history/currentchange-event/currentchange-navigate-from-initial-about-blank-same-doc-popup.html.ini
new file mode 100644
index 000000000000..6e1b4934b0f8
--- /dev/null
+++ b/testing/web-platform/meta/app-history/currentchange-event/currentchange-navigate-from-initial-about-blank-same-doc-popup.html.ini
@@ -0,0 +1,3 @@
+[currentchange-navigate-from-initial-about-blank-same-doc-popup.html]
+  [AppHistoryCurrentChangeEvent does not fire when navigating away from the initial about:blank (popup window)]
+    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/canGoBack-if-not-fully-active.html.ini b/testing/web-platform/meta/app-history/navigate/canGoBack-if-not-fully-active.html.ini
deleted file mode 100644
index 6ab027ef5f76..000000000000
--- a/testing/web-platform/meta/app-history/navigate/canGoBack-if-not-fully-active.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[canGoBack-if-not-fully-active.html]
-  [canGoBack should return false if the document is not fully active]
-    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/canGoForward-if-not-fully-active.html.ini b/testing/web-platform/meta/app-history/navigate/canGoForward-if-not-fully-active.html.ini
deleted file mode 100644
index 4177d525a3f8..000000000000
--- a/testing/web-platform/meta/app-history/navigate/canGoForward-if-not-fully-active.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[canGoForward-if-not-fully-active.html]
-  [canGoForward should return false if the document is not fully active]
-    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/return-value/back-forward-initial-about-blank.html.ini b/testing/web-platform/meta/app-history/navigate/return-value/back-forward-initial-about-blank.html.ini
new file mode 100644
index 000000000000..c48723982716
--- /dev/null
+++ b/testing/web-platform/meta/app-history/navigate/return-value/back-forward-initial-about-blank.html.ini
@@ -0,0 +1,3 @@
+[back-forward-initial-about-blank.html]
+  [back() and forward() in initial about:blank document]
+    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/return-value/back-forward-opaque-origin.html.ini b/testing/web-platform/meta/app-history/navigate/return-value/back-forward-opaque-origin.html.ini
new file mode 100644
index 000000000000..e3ab732260f5
--- /dev/null
+++ b/testing/web-platform/meta/app-history/navigate/return-value/back-forward-opaque-origin.html.ini
@@ -0,0 +1,3 @@
+[back-forward-opaque-origin.html]
+  [appHistory.back()/forward() in an opaque origin iframe]
+    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/return-value/back-initial-about-blank.html.ini b/testing/web-platform/meta/app-history/navigate/return-value/back-initial-about-blank.html.ini
deleted file mode 100644
index de10d6f39e9f..000000000000
--- a/testing/web-platform/meta/app-history/navigate/return-value/back-initial-about-blank.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[back-initial-about-blank.html]
-  [back() in initial about:blank document]
-    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/return-value/forward-initial-about-blank.html.ini b/testing/web-platform/meta/app-history/navigate/return-value/forward-initial-about-blank.html.ini
deleted file mode 100644
index 859c80d0ce19..000000000000
--- a/testing/web-platform/meta/app-history/navigate/return-value/forward-initial-about-blank.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[forward-initial-about-blank.html]
-  [forward() in initial about:blank document]
-    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/return-value/navigate-opaque-origin.html.ini b/testing/web-platform/meta/app-history/navigate/return-value/navigate-opaque-origin.html.ini
new file mode 100644
index 000000000000..525a889968cf
--- /dev/null
+++ b/testing/web-platform/meta/app-history/navigate/return-value/navigate-opaque-origin.html.ini
@@ -0,0 +1,3 @@
+[navigate-opaque-origin.html]
+  [appHistory.navigate() in an opaque origin iframe]
+    expected: FAIL
diff --git a/testing/web-platform/meta/app-history/navigate/state/updateCurrent/opaque-origin.html.ini b/testing/web-platform/meta/app-history/navigate/state/updateCurrent/opaque-origin.html.ini
new file mode 100644
index 000000000000..37bcc62bd91f
--- /dev/null
+++ b/testing/web-platform/meta/app-history/navigate/state/updateCurrent/opaque-origin.html.ini
@@ -0,0 +1,3 @@
+[opaque-origin.html]
+  [appHistory.updateCurrent() in an opaque origin iframe]
+    expected: FAIL