diff --git a/src/browser/tests/legacy/html/history/history.html b/src/browser/tests/legacy/html/history/history.html
index a1635a2e..824e0e02 100644
--- a/src/browser/tests/legacy/html/history/history.html
+++ b/src/browser/tests/legacy/html/history/history.html
@@ -11,7 +11,7 @@
     testing.expectEqual('auto', history.scrollRestoration);
     testing.expectEqual(null, history.state)
 
-    history.pushState({ testInProgress: true }, null, 'http://127.0.0.1:9589/html/history/history_after_nav.html');
+    history.pushState({ testInProgress: true }, null, 'http://127.0.0.1:9589/html/history/history_after_nav.skip.html');
     testing.expectEqual({ testInProgress: true }, history.state);
 
     history.pushState({ testInProgress: false }, null, 'http://127.0.0.1:9589/xhr/json');
diff --git a/src/browser/tests/legacy/html/history/history2.html b/src/browser/tests/legacy/html/history/history2.html
index 56b840da..cb251092 100644
--- a/src/browser/tests/legacy/html/history/history2.html
+++ b/src/browser/tests/legacy/html/history/history2.html
@@ -4,12 +4,7 @@
 <script id=history2>
     let state = { "new": "field", testComplete: true, testInProgress: true };
     history.replaceState(state, "");
-
-    history.pushState(
-      null,
-      null,
-      'http://127.0.0.1:9589/html/history/history_after_nav.html'
-    );
+    history.pushState(null, null, 'http://127.0.0.1:9589/html/history/history_after_nav.skip.html');
 
     let popstateEventFired = false;
     let popstateEventState = null;
diff --git a/src/browser/tests/legacy/html/history/history_after_nav.html b/src/browser/tests/legacy/html/history/history_after_nav.html
deleted file mode 100644
index 17ed50cf..00000000
--- a/src/browser/tests/legacy/html/history/history_after_nav.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<script src="../../testing.js"></script>
-
-<script id=history-after-nav>
-    if (history.state) {
-        testing.expectEqual(true, history.state.testInProgress);
-    } else {
-        testing.expectEqual(true, true);
-    }
-</script>
diff --git a/src/browser/tests/legacy/html/history/history_after_nav.skip.html b/src/browser/tests/legacy/html/history/history_after_nav.skip.html
new file mode 100644
index 00000000..5180b14a
--- /dev/null
+++ b/src/browser/tests/legacy/html/history/history_after_nav.skip.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<script src="../../testing.js"></script>
+
+<script id=history-after-nav>
+    testing.expectEqual(true, history.state && history.state.testInProgress);
+</script>
diff --git a/src/browser/tests/legacy/html/navigation/navigation.html b/src/browser/tests/legacy/html/navigation/navigation.html
index 99f72e75..f30b9e8e 100644
--- a/src/browser/tests/legacy/html/navigation/navigation.html
+++ b/src/browser/tests/legacy/html/navigation/navigation.html
@@ -12,7 +12,7 @@
     const currentIndex = navigation.currentEntry.index;
 
     navigation.navigate(
-        'http://localhost:9589/html/navigation/navigation2.html',
+        'http://localhost:9589/html/navigation/navigation_after_nav.skip.html',
         { state: { currentIndex: currentIndex, navTestInProgress: true } }
     );
 </script>
diff --git a/src/browser/tests/legacy/html/navigation/navigation2.html b/src/browser/tests/legacy/html/navigation/navigation_after_nav.skip.html
similarity index 88%
rename from src/browser/tests/legacy/html/navigation/navigation2.html
rename to src/browser/tests/legacy/html/navigation/navigation_after_nav.skip.html
index b16fa917..e55691bb 100644
--- a/src/browser/tests/legacy/html/navigation/navigation2.html
+++ b/src/browser/tests/legacy/html/navigation/navigation_after_nav.skip.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="../../testing.js"></script>
 
-<script id=navigation2>
+<script id=navigation-after-nav>
     const state = navigation.currentEntry.getState();
     testing.expectEqual(true, state.navTestInProgress);
     testing.expectEqual(state.currentIndex + 1, navigation.currentEntry.index);
diff --git a/src/main_legacy_test.zig b/src/main_legacy_test.zig
index cdec1fcb..d478647e 100644
--- a/src/main_legacy_test.zig
+++ b/src/main_legacy_test.zig
@@ -62,6 +62,10 @@ pub fn main() !void {
             continue;
         }
 
+        if (std.mem.endsWith(u8, entry.basename, ".skip.html")) {
+            continue;
+        }
+
         // These are crashing, comment this out to skip them.
 
         // if (std.mem.indexOf(u8, entry.basename, "navigation") != null) {
