diff --git a/src/browser/polyfill/webcomponents.zig b/src/browser/polyfill/webcomponents.zig
index 2f4f44cd..6c32f126 100644
--- a/src/browser/polyfill/webcomponents.zig
+++ b/src/browser/polyfill/webcomponents.zig
@@ -37,31 +37,6 @@ pub const pre =
 ;
 
 const testing = @import("../../testing.zig");
-test "Browser.webcomponents" {
-    var runner = try testing.jsRunner(testing.tracking_allocator, .{ .html = "<div id=main></div>" });
-    defer runner.deinit();
-
-    try @import("polyfill.zig").preload(testing.allocator, runner.page.main_context);
-
-    try runner.testCases(&.{
-        .{
-            \\ class LightPanda extends HTMLElement {
-            \\   constructor() {
-            \\     super();
-            \\   }
-            \\   connectedCallback() {
-            \\     this.append('connected');
-            \\   }
-            \\ }
-            \\ window.customElements.define("lightpanda-test", LightPanda);
-            \\ const main = document.getElementById('main');
-            \\ main.appendChild(document.createElement('lightpanda-test'));
-            ,
-            null,
-        },
-
-        .{ "main.innerHTML", "<lightpanda-test>connected</lightpanda-test>" },
-        .{ "document.createElement('lightpanda-test').dataset", "[object DataSet]" },
-        .{ "document.createElement('lightpanda-test.x').dataset", "[object DataSet]" },
-    }, .{});
+test "Browser: Polyfill.WebComponents" {
+    try testing.htmlRunner("polyfill/webcomponents.html");
 }
diff --git a/src/browser/storage/storage.zig b/src/browser/storage/storage.zig
index 7b00a223..d68342b5 100644
--- a/src/browser/storage/storage.zig
+++ b/src/browser/storage/storage.zig
@@ -208,29 +208,11 @@ pub const Bottle = struct {
 // -----
 
 const testing = @import("../../testing.zig");
-test "Browser.Storage.LocalStorage" {
-    var runner = try testing.jsRunner(testing.tracking_allocator, .{});
-    defer runner.deinit();
-
-    try runner.testCases(&.{
-        .{ "localStorage.length", "0" },
-
-        .{ "localStorage.setItem('foo', 'bar')", "undefined" },
-        .{ "localStorage.length", "1" },
-        .{ "localStorage.getItem('foo')", "bar" },
-        .{ "localStorage.removeItem('foo')", "undefined" },
-        .{ "localStorage.length", "0" },
-
-        // .{ "localStorage['foo'] = 'bar'", "undefined" },
-        // .{ "localStorage['foo']", "bar" },
-        // .{ "localStorage.length", "1" },
-
-        .{ "localStorage.clear()", "undefined" },
-        .{ "localStorage.length", "0" },
-    }, .{});
+test "Browser: Storage.LocalStorage" {
+    try testing.htmlRunner("storage/local_storage.html");
 }
 
-test "storage bottle" {
+test "Browser: Storage.Bottle" {
     var bottle = Bottle.init(std.testing.allocator);
     defer bottle.deinit();
 
diff --git a/src/tests/polyfill/webcomponents.html b/src/tests/polyfill/webcomponents.html
new file mode 100644
index 00000000..bc47c882
--- /dev/null
+++ b/src/tests/polyfill/webcomponents.html
@@ -0,0 +1,22 @@
+<script src="../testing.js"></script>
+
+<div id=main></div>
+
+<script id=webcomponents>
+  class LightPanda extends HTMLElement {
+    constructor() {
+      super();
+    }
+    connectedCallback() {
+      this.append('connected');
+    }
+  }
+
+  window.customElements.define("lightpanda-test", LightPanda);
+  const main = document.getElementById('main');
+  main.appendChild(document.createElement('lightpanda-test'));
+
+  testing.expectEqual('<lightpanda-test>connected</lightpanda-test>', main.innerHTML)
+  testing.expectEqual('[object DataSet]', document.createElement('lightpanda-test').dataset.toString());
+  testing.expectEqual('[object DataSet]', document.createElement('lightpanda-test.x').dataset.toString());
+</script>
diff --git a/src/tests/storage/local_storage.html b/src/tests/storage/local_storage.html
new file mode 100644
index 00000000..d4605844
--- /dev/null
+++ b/src/tests/storage/local_storage.html
@@ -0,0 +1,25 @@
+<script src="../testing.js"></script>
+
+<script id=localstorage>
+  testing.expectEqual(0, localStorage.length);
+  testing.expectEqual(null, localStorage.getItem('foo'));
+
+  localStorage.setItem('foo', 'bar');
+  testing.expectEqual(1, localStorage.length)
+  testing.expectEqual('bar', localStorage.getItem('foo'));
+
+  localStorage.removeItem('foo');
+  testing.expectEqual(0, localStorage.length)
+  testing.expectEqual(null, localStorage.getItem('foo'));
+
+  localStorage['foo'] = 'bar';
+  testing.expectEqual(1, localStorage.length);
+  testing.expectEqual('bar', localStorage['foo']);
+
+  localStorage.setItem('a', '1');
+  localStorage.setItem('b', '2');
+  localStorage.setItem('c', '3');
+  testing.expectEqual(3, localStorage.length)
+  localStorage.clear();
+  localStorage.length", "0" },
+</script>