diff --git a/web/packages/selfhosted/test/integration_tests/external_interface/test.ts b/web/packages/selfhosted/test/integration_tests/external_interface/test.ts
index 849819cb325b9..d49147448a1c2 100644
--- a/web/packages/selfhosted/test/integration_tests/external_interface/test.ts
+++ b/web/packages/selfhosted/test/integration_tests/external_interface/test.ts
@@ -69,7 +69,7 @@ describe("ExternalInterface", () => {
     it("loads the test", async () => {
         await openTest(browser, "integration_tests/external_interface");
         await injectRuffleAndWait(browser);
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await playAndMonitor(
             browser,
             player,
@@ -108,7 +108,7 @@ ExternalInterface.objectID: "flash_name"
     });
 
     it("responds to 'log'", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await browser.execute(
             (player) =>
                 player.log("Hello world!", {
@@ -136,7 +136,7 @@ ExternalInterface.objectID: "flash_name"
     });
 
     it("returns a value", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         const returned = await browser.execute(
             (player) => player.returnAValue(123.4),
             player,
@@ -155,11 +155,11 @@ ExternalInterface.objectID: "flash_name"
     });
 
     it("calls a method with delay", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await browser.execute(
             (player) =>
                 player.callMethodWithDelay("window.RuffleTest.set", true),
-            player,
+            await player,
         );
         const actualValue = await getCalledValue(browser);
         expect(actualValue).to.eql([true]);
@@ -179,13 +179,13 @@ ExternalInterface.objectID: "flash_name"
     // [NA] Broken on Ruffle at time of writing
     it.skip("calls a reentrant JS method", async () => {
         // JS -> Flash -> JS within one call
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         const actualValue = await browser.execute((player) => {
             player.callMethodImmediately("window.RuffleTest.set", {
                 nested: { object: { complex: true } },
             });
             return window.RuffleTest.get();
-        }, player);
+        }, await player);
 
         expect(actualValue).to.eql({
             nested: { object: { complex: true } },
@@ -211,10 +211,10 @@ ExternalInterface.objectID: "flash_name"
 
     it("calls a reentrant Flash method", async () => {
         // Flash -> JS -> Flash within one call
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await browser.execute((player) => {
             player.callMethodWithDelay("window.RuffleTest.log", "Reentrant!");
-        }, player);
+        }, await player);
 
         // [NA] Because of the delay, if we fetch immediately we *may* just get part of the log.
         await browser.pause(200);
@@ -236,13 +236,13 @@ log called with 1 argument
     });
 
     it("supports a JS function as name", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await browser.execute((player) => {
             player.callMethodWithDelay(
                 "function(name){window.RuffleTest.set(name)}",
                 "test",
             );
-        }, player);
+        }, await player);
 
         // [NA] Because of the delay, if we fetch immediately we *may* just get part of the log.
         await browser.pause(200);
@@ -263,10 +263,10 @@ log called with 1 argument
     });
 
     it("supports calling a method that doesn't exist", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await browser.execute((player) => {
             player.callMethodWithDelay("does.not.exist");
-        }, player);
+        }, await player);
 
         // [NA] Because of the delay, if we fetch immediately we *may* just get part of the log.
         await browser.pause(200);
@@ -283,12 +283,12 @@ log called with 1 argument
     });
 
     it("doesn't enforce Strict Mode", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await browser.execute((player) => {
             player.callMethodWithDelay(
                 "function(){return aPropertyThatDoesntExist = 'success!'}",
             );
-        }, player);
+        }, await player);
 
         // [NA] Because of the delay, if we fetch immediately we *may* just get part of the log.
         await browser.pause(200);
@@ -305,7 +305,7 @@ log called with 1 argument
     });
 
     it("allows overriding a Ruffle method", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
         await browser.execute((player) => {
             player.addAnotherCallback("isPlaying", "isPlaying from EI");
         }, player);
@@ -325,7 +325,7 @@ log called with 1 argument
     });
 
     it("allows redefining a method", async () => {
-        const player = await browser.$("<ruffle-object>");
+        const player = await browser.$("ruffle-object");
 
         // First definition
         await browser.execute((player) => {
diff --git a/web/packages/selfhosted/test/polyfill/classic_frames_injected/test.ts b/web/packages/selfhosted/test/polyfill/classic_frames_injected/test.ts
index 8b6cd14bde988..d5660b514f1ac 100644
--- a/web/packages/selfhosted/test/polyfill/classic_frames_injected/test.ts
+++ b/web/packages/selfhosted/test/polyfill/classic_frames_injected/test.ts
@@ -13,11 +13,11 @@ describe("Flash inside frame with injected ruffle", () => {
     it("polyfills inside a frame", async () => {
         await injectRuffleAndWait(browser);
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -39,11 +39,11 @@ describe("Flash inside frame with injected ruffle", () => {
         // And finally, check
         await browser.switchToFrame(null);
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/classic_frames_provided/test.ts b/web/packages/selfhosted/test/polyfill/classic_frames_provided/test.ts
index 8ab60e469bbb8..492fb2f999628 100644
--- a/web/packages/selfhosted/test/polyfill/classic_frames_provided/test.ts
+++ b/web/packages/selfhosted/test/polyfill/classic_frames_provided/test.ts
@@ -12,11 +12,11 @@ describe("Flash inside frame with provided ruffle", () => {
 
     it("polyfills inside a frame", async () => {
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -38,11 +38,11 @@ describe("Flash inside frame with provided ruffle", () => {
         // And finally, check
         await browser.switchToFrame(null);
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/embed_default/test.ts b/web/packages/selfhosted/test/polyfill/embed_default/test.ts
index a56820b11a15e..ef83cecea6295 100644
--- a/web/packages/selfhosted/test/polyfill/embed_default/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_default/test.ts
@@ -14,7 +14,7 @@ describe("Embed tag", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Embed tag", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/embed_insensitive/test.ts b/web/packages/selfhosted/test/polyfill/embed_insensitive/test.ts
index 7775ccb365f5c..8ca7f3911e9e4 100644
--- a/web/packages/selfhosted/test/polyfill/embed_insensitive/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_insensitive/test.ts
@@ -12,11 +12,11 @@ describe("Embed with case-insensitive MIME type", () => {
 
     it("Polyfills", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<ruffle-embed />").waitForExist();
+        await browser.$("ruffle-embed").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -27,7 +27,7 @@ describe("Embed with case-insensitive MIME type", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/embed_inside_audio/test.ts b/web/packages/selfhosted/test/polyfill/embed_inside_audio/test.ts
index 6c92e6b5b5c6b..138853aa901e3 100644
--- a/web/packages/selfhosted/test/polyfill/embed_inside_audio/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_inside_audio/test.ts
@@ -14,7 +14,7 @@ describe("Embed inside audio node", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/embed_missing_src/test.ts b/web/packages/selfhosted/test/polyfill/embed_missing_src/test.ts
index 2353122b6a288..986c59974a176 100644
--- a/web/packages/selfhosted/test/polyfill/embed_missing_src/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_missing_src/test.ts
@@ -14,7 +14,7 @@ describe("Embed without src attribute", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/embed_missing_type/test.ts b/web/packages/selfhosted/test/polyfill/embed_missing_type/test.ts
index b5885d254e36e..06fca6c36db12 100644
--- a/web/packages/selfhosted/test/polyfill/embed_missing_type/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_missing_type/test.ts
@@ -14,7 +14,7 @@ describe("Embed without type attribute", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Embed without type attribute", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/embed_unexpected_string/test.ts b/web/packages/selfhosted/test/polyfill/embed_unexpected_string/test.ts
index 52808ac8d6694..a76e5d398130b 100644
--- a/web/packages/selfhosted/test/polyfill/embed_unexpected_string/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_unexpected_string/test.ts
@@ -14,7 +14,7 @@ describe("Embed with unexpected string", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/embed_wrong_type/test.ts b/web/packages/selfhosted/test/polyfill/embed_wrong_type/test.ts
index dd2b8137cf386..8e67b1154337a 100644
--- a/web/packages/selfhosted/test/polyfill/embed_wrong_type/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_wrong_type/test.ts
@@ -14,7 +14,7 @@ describe("Embed with wrong type attribute value", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/embed_youtube/test.ts b/web/packages/selfhosted/test/polyfill/embed_youtube/test.ts
index 8cd6717b090d1..178749b19cf4c 100644
--- a/web/packages/selfhosted/test/polyfill/embed_youtube/test.ts
+++ b/web/packages/selfhosted/test/polyfill/embed_youtube/test.ts
@@ -14,7 +14,7 @@ describe("Embed with Flash YouTube video", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/iframes_injected/test.ts b/web/packages/selfhosted/test/polyfill/iframes_injected/test.ts
index a8e36f800daed..2ded878086393 100644
--- a/web/packages/selfhosted/test/polyfill/iframes_injected/test.ts
+++ b/web/packages/selfhosted/test/polyfill/iframes_injected/test.ts
@@ -13,11 +13,11 @@ describe("Flash inside iframe with injected ruffle", () => {
     it("polyfills inside an iframe", async () => {
         await injectRuffleAndWait(browser);
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -38,11 +38,11 @@ describe("Flash inside iframe with injected ruffle", () => {
         // And finally, check
         await browser.switchToFrame(null);
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/iframes_onload/test.ts b/web/packages/selfhosted/test/polyfill/iframes_onload/test.ts
index 25f6fe568cae9..f778bc2d6634f 100644
--- a/web/packages/selfhosted/test/polyfill/iframes_onload/test.ts
+++ b/web/packages/selfhosted/test/polyfill/iframes_onload/test.ts
@@ -12,11 +12,11 @@ describe("iframe onload", () => {
 
     it("runs the iframe onload event", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<div />").waitForExist();
+        await browser.$("div").waitForExist();
 
         const actual = await browser
             .$("#container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/iframes_provided/test.ts b/web/packages/selfhosted/test/polyfill/iframes_provided/test.ts
index e474e2d0c8cf7..6cf0cd8b0a7ed 100644
--- a/web/packages/selfhosted/test/polyfill/iframes_provided/test.ts
+++ b/web/packages/selfhosted/test/polyfill/iframes_provided/test.ts
@@ -12,11 +12,11 @@ describe("Flash inside iframe with provided ruffle", () => {
 
     it("polyfills inside an iframe", async () => {
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -37,11 +37,11 @@ describe("Flash inside iframe with provided ruffle", () => {
         // And finally, check
         await browser.switchToFrame(null);
         await browser.switchToFrame(await browser.$("#test-frame"));
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/object_MIME_insensitive/test.ts b/web/packages/selfhosted/test/polyfill/object_MIME_insensitive/test.ts
index e2f0a70f82bf7..3b1dc29ec0eca 100644
--- a/web/packages/selfhosted/test/polyfill/object_MIME_insensitive/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_MIME_insensitive/test.ts
@@ -12,11 +12,11 @@ describe("Object with case-insensitive MIME type", () => {
 
     it("Polyfills", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -27,7 +27,7 @@ describe("Object with case-insensitive MIME type", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_clsid_insensitive/test.ts b/web/packages/selfhosted/test/polyfill/object_clsid_insensitive/test.ts
index 4e84d9182701f..3951b149b4835 100644
--- a/web/packages/selfhosted/test/polyfill/object_clsid_insensitive/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_clsid_insensitive/test.ts
@@ -12,11 +12,11 @@ describe("Object with case-insensitive clsid", () => {
 
     it("Polyfills", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -27,7 +27,7 @@ describe("Object with case-insensitive clsid", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_clsid_with_embed/test.ts b/web/packages/selfhosted/test/polyfill/object_clsid_with_embed/test.ts
index 75a772f46f7ef..84a6708563f7f 100644
--- a/web/packages/selfhosted/test/polyfill/object_clsid_with_embed/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_clsid_with_embed/test.ts
@@ -14,7 +14,7 @@ describe("Object with clsid and embed", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object with clsid and embed", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_data/test.ts b/web/packages/selfhosted/test/polyfill/object_data/test.ts
index 14418965452d1..8102e0bf82cb3 100644
--- a/web/packages/selfhosted/test/polyfill/object_data/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_data/test.ts
@@ -12,11 +12,11 @@ describe("Object with only data attribute", () => {
 
     it("Polyfills", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -27,7 +27,7 @@ describe("Object with only data attribute", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_default/test.ts b/web/packages/selfhosted/test/polyfill/object_default/test.ts
index 170eea579eb45..7d4107cb71e5c 100644
--- a/web/packages/selfhosted/test/polyfill/object_default/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_default/test.ts
@@ -14,7 +14,7 @@ describe("Object tag", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object tag", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_double_object/test.ts b/web/packages/selfhosted/test/polyfill/object_double_object/test.ts
index 47811d8bb5dc0..2b2530e43f8e2 100644
--- a/web/packages/selfhosted/test/polyfill/object_double_object/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_double_object/test.ts
@@ -14,7 +14,7 @@ describe("Object with another object tag", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object with another object tag", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_double_object_classid/test.ts b/web/packages/selfhosted/test/polyfill/object_double_object_classid/test.ts
index b5041e0b53280..c3808d7228cf9 100644
--- a/web/packages/selfhosted/test/polyfill/object_double_object_classid/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_double_object_classid/test.ts
@@ -14,7 +14,7 @@ describe("Object using classid with another object tag without classid", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object using classid with another object tag without classid", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_flashvars/test.ts b/web/packages/selfhosted/test/polyfill/object_flashvars/test.ts
index 7dfe4d93a84ef..dec1ecc9b58e2 100644
--- a/web/packages/selfhosted/test/polyfill/object_flashvars/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_flashvars/test.ts
@@ -14,7 +14,7 @@ describe("Object tag", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object tag", () => {
     it("Plays a movie with flashvars", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
             `// _level0.a
 1
 
diff --git a/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.ts b/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.ts
index 97a5827ca6eff..e9048733111c5 100644
--- a/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.ts
@@ -14,7 +14,7 @@ describe("Object tag", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object tag", () => {
     it("Plays a movie with flashvars", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
             `// _level0.a
 1
 
diff --git a/web/packages/selfhosted/test/polyfill/object_ie_only/test.ts b/web/packages/selfhosted/test/polyfill/object_ie_only/test.ts
index 80661394e8d6c..d77b937b25cda 100644
--- a/web/packages/selfhosted/test/polyfill/object_ie_only/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_ie_only/test.ts
@@ -14,7 +14,7 @@ describe("Object for old IE must work everywhere", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object for old IE must work everywhere", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_inside_audio/test.ts b/web/packages/selfhosted/test/polyfill/object_inside_audio/test.ts
index f610d049f127c..d20211d9b9fb1 100644
--- a/web/packages/selfhosted/test/polyfill/object_inside_audio/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_inside_audio/test.ts
@@ -14,7 +14,7 @@ describe("Object inside audio node", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/object_missing_data/test.ts b/web/packages/selfhosted/test/polyfill/object_missing_data/test.ts
index e7bfefb9a5a8c..6614fc9491d30 100644
--- a/web/packages/selfhosted/test/polyfill/object_missing_data/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_missing_data/test.ts
@@ -14,7 +14,7 @@ describe("Object without data attribute", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/object_missing_type/test.ts b/web/packages/selfhosted/test/polyfill/object_missing_type/test.ts
index 54a94bbf57951..3d4e4f954c72a 100644
--- a/web/packages/selfhosted/test/polyfill/object_missing_type/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_missing_type/test.ts
@@ -14,7 +14,7 @@ describe("Object without type attribute", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object without type attribute", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/test.ts b/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/test.ts
index d43bfdcdc2d74..4dbbd06e6107c 100644
--- a/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/test.ts
@@ -14,7 +14,7 @@ describe("Object without type and classid attributes", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object without type and classid attributes", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.ts b/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.ts
index e7a3e43393e73..9c256770acafe 100644
--- a/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.ts
@@ -14,7 +14,7 @@ describe("Object with unexpected string", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object with unexpected string", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_with_ruffle_embed/test.ts b/web/packages/selfhosted/test/polyfill/object_with_ruffle_embed/test.ts
index 17b955e62e3eb..05d27e5128a19 100644
--- a/web/packages/selfhosted/test/polyfill/object_with_ruffle_embed/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_with_ruffle_embed/test.ts
@@ -14,7 +14,7 @@ describe("Object with ruffle-embed tag", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/object_wrong_type/test.ts b/web/packages/selfhosted/test/polyfill/object_wrong_type/test.ts
index ec573bf347632..3a011fe0adf90 100644
--- a/web/packages/selfhosted/test/polyfill/object_wrong_type/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_wrong_type/test.ts
@@ -14,7 +14,7 @@ describe("Object with wrong type attribute value", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -25,7 +25,7 @@ describe("Object with wrong type attribute value", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-embed />"),
+            await browser.$("#test-container").$("ruffle-embed"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_youtube/test.ts b/web/packages/selfhosted/test/polyfill/object_youtube/test.ts
index fb02eb97845bc..c4244754ae823 100644
--- a/web/packages/selfhosted/test/polyfill/object_youtube/test.ts
+++ b/web/packages/selfhosted/test/polyfill/object_youtube/test.ts
@@ -14,7 +14,7 @@ describe("Object with Flash YouTube video", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/pdf/test.ts b/web/packages/selfhosted/test/polyfill/pdf/test.ts
index 04bd22ca65d5e..b9a6842601ed9 100644
--- a/web/packages/selfhosted/test/polyfill/pdf/test.ts
+++ b/web/packages/selfhosted/test/polyfill/pdf/test.ts
@@ -14,7 +14,7 @@ describe("PDF object", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/pdf_with_get/test.ts b/web/packages/selfhosted/test/polyfill/pdf_with_get/test.ts
index 63b08b7b16a48..c4143b4d33328 100644
--- a/web/packages/selfhosted/test/polyfill/pdf_with_get/test.ts
+++ b/web/packages/selfhosted/test/polyfill/pdf_with_get/test.ts
@@ -14,7 +14,7 @@ describe("PDF with .swf GET", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/remove_object/test.ts b/web/packages/selfhosted/test/polyfill/remove_object/test.ts
index 93f74476471be..b76d5ed3c26a7 100644
--- a/web/packages/selfhosted/test/polyfill/remove_object/test.ts
+++ b/web/packages/selfhosted/test/polyfill/remove_object/test.ts
@@ -14,7 +14,7 @@ describe("Remove object", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -29,7 +29,7 @@ describe("Remove object", () => {
         });
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = "";
         expect(actual).html.to.equal(expected);
     });
diff --git a/web/packages/selfhosted/test/polyfill/spl/test.ts b/web/packages/selfhosted/test/polyfill/spl/test.ts
index 50ea7cc639cfa..645f997fff71a 100644
--- a/web/packages/selfhosted/test/polyfill/spl/test.ts
+++ b/web/packages/selfhosted/test/polyfill/spl/test.ts
@@ -14,7 +14,7 @@ describe("SPL", () => {
         await injectRuffleAndWait(browser);
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
diff --git a/web/packages/selfhosted/test/polyfill/swf_extension_insensitive/test.ts b/web/packages/selfhosted/test/polyfill/swf_extension_insensitive/test.ts
index f34cca74f4405..8668257eaa0fb 100644
--- a/web/packages/selfhosted/test/polyfill/swf_extension_insensitive/test.ts
+++ b/web/packages/selfhosted/test/polyfill/swf_extension_insensitive/test.ts
@@ -12,11 +12,11 @@ describe("SWF extension insensitive", () => {
 
     it("Polyfills", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -27,7 +27,7 @@ describe("SWF extension insensitive", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/swf_extension_with_fragment/test.ts b/web/packages/selfhosted/test/polyfill/swf_extension_with_fragment/test.ts
index 18054d6e81e7e..78a42279bca5f 100644
--- a/web/packages/selfhosted/test/polyfill/swf_extension_with_fragment/test.ts
+++ b/web/packages/selfhosted/test/polyfill/swf_extension_with_fragment/test.ts
@@ -12,11 +12,11 @@ describe("SWF extension, file with fragment", () => {
 
     it("Polyfills", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -27,7 +27,7 @@ describe("SWF extension, file with fragment", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/swf_extension_with_get/test.ts b/web/packages/selfhosted/test/polyfill/swf_extension_with_get/test.ts
index 9b12c88adb91e..506b390af48cf 100644
--- a/web/packages/selfhosted/test/polyfill/swf_extension_with_get/test.ts
+++ b/web/packages/selfhosted/test/polyfill/swf_extension_with_get/test.ts
@@ -12,11 +12,11 @@ describe("SWF extension, file with GET parameter", () => {
 
     it("Polyfills", async () => {
         await injectRuffleAndWait(browser);
-        await browser.$("<ruffle-object />").waitForExist();
+        await browser.$("ruffle-object").waitForExist();
 
         const actual = await browser
             .$("#test-container")
-            .getHTML({ includeSelectorTag: false });
+            .getHTML({ includeSelectorTag: false, pierceShadowRoot: false });
         const expected = fs.readFileSync(
             `${import.meta.dirname}/expected.html`,
             "utf8",
@@ -27,7 +27,7 @@ describe("SWF extension, file with GET parameter", () => {
     it("Plays a movie", async () => {
         await playAndMonitor(
             browser,
-            await browser.$("#test-container").$("<ruffle-object />"),
+            await browser.$("#test-container").$("ruffle-object"),
         );
     });
 });