diff --git a/web/packages/selfhosted/test/polyfill/object_default/expected.html b/web/packages/selfhosted/test/polyfill/object_default/expected.html
index 32346d6c5..cd14aeee7 100644
--- a/web/packages/selfhosted/test/polyfill/object_default/expected.html
+++ b/web/packages/selfhosted/test/polyfill/object_default/expected.html
@@ -1,4 +1,4 @@
-<ruffle-object
+<object
     type="application/x-shockwave-flash"
     classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
     width="550"
@@ -16,4 +16,4 @@
         menu="false"
         pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
     />
-</ruffle-object>
\ No newline at end of file
+</object>
\ No newline at end of file
diff --git a/web/packages/selfhosted/test/polyfill/object_default/test.js b/web/packages/selfhosted/test/polyfill/object_default/test.js
index 0273d691b..98dc97a30 100644
--- a/web/packages/selfhosted/test/polyfill/object_default/test.js
+++ b/web/packages/selfhosted/test/polyfill/object_default/test.js
@@ -24,7 +24,7 @@ describe("Object tag", () => {
     it("Plays a movie", () => {
         play_and_monitor(
             browser,
-            browser.$("#test-container").$("<ruffle-object />")
+            browser.$("#test-container").$("<ruffle-embed />")
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_flashvars/expected.html b/web/packages/selfhosted/test/polyfill/object_flashvars/expected.html
index d034e9b05..f02356d51 100644
--- a/web/packages/selfhosted/test/polyfill/object_flashvars/expected.html
+++ b/web/packages/selfhosted/test/polyfill/object_flashvars/expected.html
@@ -1,4 +1,4 @@
-<ruffle-object
+<object
         type="application/x-shockwave-flash"
         classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
         width="550"
@@ -11,10 +11,11 @@
     <param name="flashvars" value="a=1&b=3+%253&d[]=foo" />
     <ruffle-embed
             src="/test_assets/flashvars.swf?a=default&c"
+            flashvars="a=1&b=3+%253&d[]=foo"
             width="550"
             height="400"
             quality="high"
             menu="false"
             pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
     />
-</ruffle-object>
\ No newline at end of file
+</object>
\ No newline at end of file
diff --git a/web/packages/selfhosted/test/polyfill/object_flashvars/index.html b/web/packages/selfhosted/test/polyfill/object_flashvars/index.html
index c37d73359..f9a5fab59 100644
--- a/web/packages/selfhosted/test/polyfill/object_flashvars/index.html
+++ b/web/packages/selfhosted/test/polyfill/object_flashvars/index.html
@@ -20,6 +20,7 @@
                 <param name="flashvars" value="a=1&b=3+%253&d[]=foo" />
                 <embed
                     src="/test_assets/flashvars.swf?a=default&c"
+                    flashvars="a=1&b=3+%253&d[]=foo"
                     width="550"
                     height="400"
                     quality="high"
diff --git a/web/packages/selfhosted/test/polyfill/object_flashvars/test.js b/web/packages/selfhosted/test/polyfill/object_flashvars/test.js
index 1dea7b6c8..a21335c89 100644
--- a/web/packages/selfhosted/test/polyfill/object_flashvars/test.js
+++ b/web/packages/selfhosted/test/polyfill/object_flashvars/test.js
@@ -24,7 +24,7 @@ describe("Object tag", () => {
     it("Plays a movie with flashvars", () => {
         play_and_monitor(
             browser,
-            browser.$("#test-container").$("<ruffle-object />"),
+            browser.$("#test-container").$("<ruffle-embed />"),
             `// _level0.a
 1
 
diff --git a/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/expected.html b/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/expected.html
index 073a2d70b..45b1b0739 100644
--- a/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/expected.html
+++ b/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/expected.html
@@ -1,4 +1,4 @@
-<ruffle-object
+<object
         type="application/x-shockwave-flash"
         classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
         width="550"
@@ -16,4 +16,4 @@
             menu="false"
             pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
     />
-</ruffle-object>
\ No newline at end of file
+</object>
\ No newline at end of file
diff --git a/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.js b/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.js
index 1dea7b6c8..a21335c89 100644
--- a/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.js
+++ b/web/packages/selfhosted/test/polyfill/object_flashvars_in_url/test.js
@@ -24,7 +24,7 @@ describe("Object tag", () => {
     it("Plays a movie with flashvars", () => {
         play_and_monitor(
             browser,
-            browser.$("#test-container").$("<ruffle-object />"),
+            browser.$("#test-container").$("<ruffle-embed />"),
             `// _level0.a
 1
 
diff --git a/web/packages/selfhosted/test/polyfill/object_missing_type/expected.html b/web/packages/selfhosted/test/polyfill/object_missing_type/expected.html
index b59e446b0..7cd76bd71 100644
--- a/web/packages/selfhosted/test/polyfill/object_missing_type/expected.html
+++ b/web/packages/selfhosted/test/polyfill/object_missing_type/expected.html
@@ -1,4 +1,4 @@
-<ruffle-object
+<object
     classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
     width="550"
     height="400"
@@ -15,4 +15,4 @@
         menu="false"
         pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
     />
-</ruffle-object>
\ No newline at end of file
+</object>
\ No newline at end of file
diff --git a/web/packages/selfhosted/test/polyfill/object_missing_type/test.js b/web/packages/selfhosted/test/polyfill/object_missing_type/test.js
index e460f7709..44236e550 100644
--- a/web/packages/selfhosted/test/polyfill/object_missing_type/test.js
+++ b/web/packages/selfhosted/test/polyfill/object_missing_type/test.js
@@ -24,7 +24,7 @@ describe("Object without type attribute", () => {
     it("Plays a movie", () => {
         play_and_monitor(
             browser,
-            browser.$("#test-container").$("<ruffle-object />")
+            browser.$("#test-container").$("<ruffle-embed />")
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/expected.html b/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/expected.html
index 29b394b0c..3949198e7 100644
--- a/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/expected.html
+++ b/web/packages/selfhosted/test/polyfill/object_missing_type_and_classid/expected.html
@@ -6,12 +6,4 @@
     <param name="movie" value="/test_assets/example.swf" />
     <param name="quality" value="high" />
     <param name="menu" value="false" />
-    <ruffle-embed
-        src="/test_assets/example.swf"
-        width="550"
-        height="400"
-        quality="high"
-        menu="false"
-        pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
-    />
 </ruffle-object>
\ No newline at end of file
diff --git a/web/packages/selfhosted/test/polyfill/object_unexpected_string/expected.html b/web/packages/selfhosted/test/polyfill/object_unexpected_string/expected.html
index 32346d6c5..f697e8d91 100644
--- a/web/packages/selfhosted/test/polyfill/object_unexpected_string/expected.html
+++ b/web/packages/selfhosted/test/polyfill/object_unexpected_string/expected.html
@@ -1,4 +1,5 @@
-<ruffle-object
+<object
+    "YeahWhyDoingThis"
     type="application/x-shockwave-flash"
     classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
     width="550"
@@ -16,4 +17,4 @@
         menu="false"
         pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
     />
-</ruffle-object>
\ No newline at end of file
+</object>
\ No newline at end of file
diff --git a/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.js b/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.js
index d39466b22..5e9599b62 100644
--- a/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.js
+++ b/web/packages/selfhosted/test/polyfill/object_unexpected_string/test.js
@@ -24,7 +24,7 @@ describe("Object with unexpected string", () => {
     it("Plays a movie", () => {
         play_and_monitor(
             browser,
-            browser.$("#test-container").$("<ruffle-object />")
+            browser.$("#test-container").$("<ruffle-embed />")
         );
     });
 });
diff --git a/web/packages/selfhosted/test/polyfill/object_wrong_type/expected.html b/web/packages/selfhosted/test/polyfill/object_wrong_type/expected.html
index ed63bb77e..190297133 100644
--- a/web/packages/selfhosted/test/polyfill/object_wrong_type/expected.html
+++ b/web/packages/selfhosted/test/polyfill/object_wrong_type/expected.html
@@ -1,4 +1,4 @@
-<ruffle-object
+<object
     type="DUNNO"
     classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
     width="550"
@@ -16,4 +16,4 @@
         menu="false"
         pluginspage="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"
     />
-</ruffle-object>
\ No newline at end of file
+</object>
\ No newline at end of file
diff --git a/web/packages/selfhosted/test/polyfill/object_wrong_type/test.js b/web/packages/selfhosted/test/polyfill/object_wrong_type/test.js
index 2e6c00a61..a2d690c98 100644
--- a/web/packages/selfhosted/test/polyfill/object_wrong_type/test.js
+++ b/web/packages/selfhosted/test/polyfill/object_wrong_type/test.js
@@ -24,7 +24,7 @@ describe("Object with wrong type attribute value", () => {
     it("Plays a movie", () => {
         play_and_monitor(
             browser,
-            browser.$("#test-container").$("<ruffle-object />")
+            browser.$("#test-container").$("<ruffle-embed />")
         );
     });
 });