diff --git a/test/css/samples/attribute-selector-only-name/expected.css b/test/css/samples/attribute-selector-only-name/expected.css
index 2217e804d9..e2bbf5b48c 100644
--- a/test/css/samples/attribute-selector-only-name/expected.css
+++ b/test/css/samples/attribute-selector-only-name/expected.css
@@ -1 +1 @@
-[foo][svelte-xyz]{color:red}[baz][svelte-xyz]{color:blue}
\ No newline at end of file
+[foo].svelte-xyz{color:red}[baz].svelte-xyz{color:blue}
\ No newline at end of file
diff --git a/test/css/samples/attribute-selector-unquoted/expected.css b/test/css/samples/attribute-selector-unquoted/expected.css
index b52e52d545..9f8f88a352 100644
--- a/test/css/samples/attribute-selector-unquoted/expected.css
+++ b/test/css/samples/attribute-selector-unquoted/expected.css
@@ -1 +1 @@
-[foo=bar][svelte-xyz]{color:red}
\ No newline at end of file
+[foo=bar].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/basic/expected.css b/test/css/samples/basic/expected.css
index 290ea521e4..49670b1fd5 100644
--- a/test/css/samples/basic/expected.css
+++ b/test/css/samples/basic/expected.css
@@ -1 +1 @@
-div[svelte-xyz],[svelte-xyz] div{color:red}
\ No newline at end of file
+div.svelte-xyz,.svelte-xyz div{color:red}
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-empty-rule-dev/expected.css b/test/css/samples/cascade-false-empty-rule-dev/expected.css
index 5e2b654711..4013e47e5d 100644
--- a/test/css/samples/cascade-false-empty-rule-dev/expected.css
+++ b/test/css/samples/cascade-false-empty-rule-dev/expected.css
@@ -1 +1 @@
-.foo[svelte-xyz]{}
\ No newline at end of file
+.foo.svelte-xyz{}
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-global-keyframes/expected.css b/test/css/samples/cascade-false-global-keyframes/expected.css
index 111e94b0cc..8e716d136d 100644
--- a/test/css/samples/cascade-false-global-keyframes/expected.css
+++ b/test/css/samples/cascade-false-global-keyframes/expected.css
@@ -1 +1 @@
-@keyframes why{0%{color:red}100%{color:blue}}.animated[svelte-xyz]{animation:why 2s}.also-animated[svelte-xyz]{animation:not-defined-here 2s}
\ No newline at end of file
+@keyframes why{0%{color:red}100%{color:blue}}.animated.svelte-xyz{animation:why 2s}.also-animated.svelte-xyz{animation:not-defined-here 2s}
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-keyframes-from-to/expected.css b/test/css/samples/cascade-false-keyframes-from-to/expected.css
index 45ae6c3520..c8ee60194c 100644
--- a/test/css/samples/cascade-false-keyframes-from-to/expected.css
+++ b/test/css/samples/cascade-false-keyframes-from-to/expected.css
@@ -1 +1 @@
-@keyframes svelte-xyz-why{from{color:red}to{color:blue}}.animated[svelte-xyz]{animation:svelte-xyz-why 2s}
\ No newline at end of file
+@keyframes svelte-xyz-why{from{color:red}to{color:blue}}.animated.svelte-xyz{animation:svelte-xyz-why 2s}
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-keyframes/expected.css b/test/css/samples/cascade-false-keyframes/expected.css
index 64fa0390eb..a6a1176dae 100644
--- a/test/css/samples/cascade-false-keyframes/expected.css
+++ b/test/css/samples/cascade-false-keyframes/expected.css
@@ -1 +1 @@
-@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.animated[svelte-xyz]{animation:svelte-xyz-why 2s}.also-animated[svelte-xyz]{animation:not-defined-here 2s}
\ No newline at end of file
+@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.animated.svelte-xyz{animation:svelte-xyz-why 2s}.also-animated.svelte-xyz{animation:not-defined-here 2s}
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-pseudo-element/expected.css b/test/css/samples/cascade-false-pseudo-element/expected.css
index edafcf9bcd..bb380d4041 100644
--- a/test/css/samples/cascade-false-pseudo-element/expected.css
+++ b/test/css/samples/cascade-false-pseudo-element/expected.css
@@ -1 +1 @@
-span[svelte-xyz]::after{content:'i am a pseudo-element'}span[svelte-xyz]:first-child{color:red}span[svelte-xyz]:last-child::after{color:blue}
\ No newline at end of file
+span.svelte-xyz::after{content:'i am a pseudo-element'}span.svelte-xyz:first-child{color:red}span.svelte-xyz:last-child::after{color:blue}
\ No newline at end of file
diff --git a/test/css/samples/cascade-false-universal-selector/expected.css b/test/css/samples/cascade-false-universal-selector/expected.css
index b203392075..3eda95e446 100644
--- a/test/css/samples/cascade-false-universal-selector/expected.css
+++ b/test/css/samples/cascade-false-universal-selector/expected.css
@@ -1 +1 @@
-[svelte-xyz]{color:red}
\ No newline at end of file
+.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/cascade-false/expected.css b/test/css/samples/cascade-false/expected.css
index c10ef8b18b..797d245dde 100644
--- a/test/css/samples/cascade-false/expected.css
+++ b/test/css/samples/cascade-false/expected.css
@@ -1 +1 @@
-div[svelte-xyz]{color:red}div.foo[svelte-xyz]{color:blue}.foo[svelte-xyz]{font-weight:bold}
\ No newline at end of file
+div.svelte-xyz{color:red}div.foo.svelte-xyz{color:blue}.foo.svelte-xyz{font-weight:bold}
\ No newline at end of file
diff --git a/test/css/samples/combinator-child/expected.css b/test/css/samples/combinator-child/expected.css
index 3f2c64212e..bf6d83d42f 100644
--- a/test/css/samples/combinator-child/expected.css
+++ b/test/css/samples/combinator-child/expected.css
@@ -1 +1 @@
-.test[svelte-xyz]>div[svelte-xyz]{color:#0af}
\ No newline at end of file
+.test.svelte-xyz>div.svelte-xyz{color:#0af}
\ No newline at end of file
diff --git a/test/css/samples/css-vars/expected.css b/test/css/samples/css-vars/expected.css
index f843bc4eb2..1b3a42567a 100644
--- a/test/css/samples/css-vars/expected.css
+++ b/test/css/samples/css-vars/expected.css
@@ -1 +1 @@
-div[svelte-xyz],[svelte-xyz] div{--test:10}
\ No newline at end of file
+div.svelte-xyz,.svelte-xyz div{--test:10}
\ No newline at end of file
diff --git a/test/css/samples/descendant-selector-non-top-level-outer/expected.css b/test/css/samples/descendant-selector-non-top-level-outer/expected.css
index a321bab611..3817f75eba 100644
--- a/test/css/samples/descendant-selector-non-top-level-outer/expected.css
+++ b/test/css/samples/descendant-selector-non-top-level-outer/expected.css
@@ -1 +1 @@
-p[svelte-xyz] span[svelte-xyz]{color:red}
\ No newline at end of file
+p.svelte-xyz span.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/keyframes/expected.css b/test/css/samples/keyframes/expected.css
index 93b5ba3232..810ba87751 100644
--- a/test/css/samples/keyframes/expected.css
+++ b/test/css/samples/keyframes/expected.css
@@ -1 +1 @@
-@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}[svelte-xyz].animated,[svelte-xyz] .animated{animation:svelte-xyz-why 2s}
\ No newline at end of file
+@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.svelte-xyz.animated,.svelte-xyz .animated{animation:svelte-xyz-why 2s}
\ No newline at end of file
diff --git a/test/css/samples/media-query-word/expected.css b/test/css/samples/media-query-word/expected.css
index 3975992f2a..592ba7e61d 100644
--- a/test/css/samples/media-query-word/expected.css
+++ b/test/css/samples/media-query-word/expected.css
@@ -1 +1 @@
-@media only screen and (min-width: 400px){div[svelte-xyz],[svelte-xyz] div{color:red}}
\ No newline at end of file
+@media only screen and (min-width: 400px){div.svelte-xyz,.svelte-xyz div{color:red}}
\ No newline at end of file
diff --git a/test/css/samples/media-query/expected.css b/test/css/samples/media-query/expected.css
index ea8cce5c00..689161de04 100644
--- a/test/css/samples/media-query/expected.css
+++ b/test/css/samples/media-query/expected.css
@@ -1 +1 @@
-@media(min-width: 400px){[svelte-xyz].large-screen,[svelte-xyz] .large-screen{display:block}}
\ No newline at end of file
+@media(min-width: 400px){.svelte-xyz.large-screen,.svelte-xyz .large-screen{display:block}}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-contains/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-contains/expected.css
index 113585c7c5..4d1d8d14ff 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-contains/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-contains/expected.css
@@ -1 +1 @@
-[data-foo*='bar'][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo*='bar'].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-case-insensitive/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-case-insensitive/expected.css
index fb8bf750c4..80b6feebca 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-case-insensitive/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-case-insensitive/expected.css
@@ -1 +1 @@
-[data-foo='bar' i][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo='bar' i].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/expected.css
index 95966c6258..fd8a9a15ee 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-equals-dynamic/expected.css
@@ -1 +1 @@
-[data-foo='bar'][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo='bar'].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-equals/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-equals/expected.css
index 95966c6258..fd8a9a15ee 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-equals/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-equals/expected.css
@@ -1 +1 @@
-[data-foo='bar'][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo='bar'].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-pipe-equals/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-pipe-equals/expected.css
index 2fa0e1f9ab..95f6faeb02 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-pipe-equals/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-pipe-equals/expected.css
@@ -1 +1 @@
-[data-foo|='bar'][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo|='bar'].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-prefix/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-prefix/expected.css
index 59f4342d98..3a30f1f017 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-prefix/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-prefix/expected.css
@@ -1 +1 @@
-[data-foo^='bar'][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo^='bar'].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-suffix/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-suffix/expected.css
index 1b47ff560d..de8d18cc3b 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-suffix/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-suffix/expected.css
@@ -1 +1 @@
-[data-foo$='bar'][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo$='bar'].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector-word-equals/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector-word-equals/expected.css
index 1241c31e7f..fabcbade4d 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector-word-equals/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector-word-equals/expected.css
@@ -1 +1 @@
-[data-foo~='bar'][svelte-xyz]{color:red}
\ No newline at end of file
+[data-foo~='bar'].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-attribute-selector/expected.css b/test/css/samples/omit-scoping-attribute-attribute-selector/expected.css
index bd48ef22c5..ddb620207d 100644
--- a/test/css/samples/omit-scoping-attribute-attribute-selector/expected.css
+++ b/test/css/samples/omit-scoping-attribute-attribute-selector/expected.css
@@ -1 +1 @@
-[autoplay][svelte-xyz]{color:red}
\ No newline at end of file
+[autoplay].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-class-dynamic/expected.css b/test/css/samples/omit-scoping-attribute-class-dynamic/expected.css
index 6c4e704d2c..431f704106 100644
--- a/test/css/samples/omit-scoping-attribute-class-dynamic/expected.css
+++ b/test/css/samples/omit-scoping-attribute-class-dynamic/expected.css
@@ -1 +1 @@
-.foo[svelte-xyz]{color:red}
\ No newline at end of file
+.foo.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-class-static/expected.css b/test/css/samples/omit-scoping-attribute-class-static/expected.css
index 6c4e704d2c..431f704106 100644
--- a/test/css/samples/omit-scoping-attribute-class-static/expected.css
+++ b/test/css/samples/omit-scoping-attribute-class-static/expected.css
@@ -1 +1 @@
-.foo[svelte-xyz]{color:red}
\ No newline at end of file
+.foo.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/expected.css b/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/expected.css
index fb5bc89f3e..f3653403a5 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/expected.css
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner-class/expected.css
@@ -1 +1 @@
-.foo[svelte-xyz] .bar{color:red}
\ No newline at end of file
+.foo.svelte-xyz .bar{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/expected.css b/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/expected.css
index b7415ff930..74e641549f 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/expected.css
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner-multiple/expected.css
@@ -1 +1 @@
-div[svelte-xyz]>p>em{color:red}
\ No newline at end of file
+div.svelte-xyz>p>em{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-inner/expected.css b/test/css/samples/omit-scoping-attribute-descendant-global-inner/expected.css
index 79ef8d29dd..338c90ab19 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-inner/expected.css
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-inner/expected.css
@@ -1 +1 @@
-div[svelte-xyz]>p{color:red}
\ No newline at end of file
+div.svelte-xyz>p{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/expected.css b/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/expected.css
index 417e702d4b..5d1af4c251 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/expected.css
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-outer-multiple/expected.css
@@ -1 +1 @@
-div>section>p[svelte-xyz]{color:red}
\ No newline at end of file
+div>section>p.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-descendant-global-outer/expected.css b/test/css/samples/omit-scoping-attribute-descendant-global-outer/expected.css
index e0bbc1d6a1..3666ce8f7f 100644
--- a/test/css/samples/omit-scoping-attribute-descendant-global-outer/expected.css
+++ b/test/css/samples/omit-scoping-attribute-descendant-global-outer/expected.css
@@ -1 +1 @@
-div>p[svelte-xyz]{color:red}
\ No newline at end of file
+div>p.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-id/expected.css b/test/css/samples/omit-scoping-attribute-id/expected.css
index 278f8614ab..0e9e9f8b29 100644
--- a/test/css/samples/omit-scoping-attribute-id/expected.css
+++ b/test/css/samples/omit-scoping-attribute-id/expected.css
@@ -1 +1 @@
-#foo[svelte-xyz]{color:red}
\ No newline at end of file
+#foo.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-whitespace-multiple/expected.css b/test/css/samples/omit-scoping-attribute-whitespace-multiple/expected.css
index f5f64cee75..737870905c 100644
--- a/test/css/samples/omit-scoping-attribute-whitespace-multiple/expected.css
+++ b/test/css/samples/omit-scoping-attribute-whitespace-multiple/expected.css
@@ -1 +1 @@
-div[svelte-xyz] section p[svelte-xyz]{color:red}
\ No newline at end of file
+div.svelte-xyz section p.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute-whitespace/expected.css b/test/css/samples/omit-scoping-attribute-whitespace/expected.css
index 8bbb1ab661..f8ef9ca56c 100644
--- a/test/css/samples/omit-scoping-attribute-whitespace/expected.css
+++ b/test/css/samples/omit-scoping-attribute-whitespace/expected.css
@@ -1 +1 @@
-div[svelte-xyz] p[svelte-xyz]{color:red}
\ No newline at end of file
+div.svelte-xyz p.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/omit-scoping-attribute/expected.css b/test/css/samples/omit-scoping-attribute/expected.css
index ea93f8a99a..5d8d69ac33 100644
--- a/test/css/samples/omit-scoping-attribute/expected.css
+++ b/test/css/samples/omit-scoping-attribute/expected.css
@@ -1 +1 @@
-p[svelte-xyz]{color:red}
\ No newline at end of file
+p.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/refs-qualified/expected.css b/test/css/samples/refs-qualified/expected.css
index 005306d25f..90e58e2a80 100644
--- a/test/css/samples/refs-qualified/expected.css
+++ b/test/css/samples/refs-qualified/expected.css
@@ -1 +1 @@
-[svelte-ref-button].active[svelte-xyz]{color:red}
\ No newline at end of file
+[svelte-ref-button].active.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/refs/expected.css b/test/css/samples/refs/expected.css
index 9c5055a064..c0018c9593 100644
--- a/test/css/samples/refs/expected.css
+++ b/test/css/samples/refs/expected.css
@@ -1 +1 @@
-[svelte-ref-a][svelte-xyz]{color:red}[svelte-ref-b][svelte-xyz]{color:green}
\ No newline at end of file
+[svelte-ref-a].svelte-xyz{color:red}[svelte-ref-b].svelte-xyz{color:green}
\ No newline at end of file
diff --git a/test/css/samples/universal-selector/expected.css b/test/css/samples/universal-selector/expected.css
index ef584e723a..70eaaedf3e 100644
--- a/test/css/samples/universal-selector/expected.css
+++ b/test/css/samples/universal-selector/expected.css
@@ -1 +1 @@
-[svelte-xyz],[svelte-xyz] *{color:red}
\ No newline at end of file
+.svelte-xyz,.svelte-xyz *{color:red}
\ No newline at end of file
diff --git a/test/css/samples/unknown-at-rule/expected.css b/test/css/samples/unknown-at-rule/expected.css
index bc350108ba..d175e2a807 100644
--- a/test/css/samples/unknown-at-rule/expected.css
+++ b/test/css/samples/unknown-at-rule/expected.css
@@ -1 +1 @@
-div[svelte-xyz],[svelte-xyz] div{@apply --funky-div;}
\ No newline at end of file
+div.svelte-xyz,.svelte-xyz div{@apply --funky-div;}
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-leading/expected.css b/test/css/samples/unused-selector-leading/expected.css
index eb0b2678cf..ff57dc09b9 100644
--- a/test/css/samples/unused-selector-leading/expected.css
+++ b/test/css/samples/unused-selector-leading/expected.css
@@ -1 +1 @@
-.bar[svelte-xyz]{color:red}
\ No newline at end of file
+.bar.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/unused-selector-ternary/expected.css b/test/css/samples/unused-selector-ternary/expected.css
index b6bba2d5f3..16fbddce58 100644
--- a/test/css/samples/unused-selector-ternary/expected.css
+++ b/test/css/samples/unused-selector-ternary/expected.css
@@ -1 +1 @@
-.active[svelte-xyz]{color:red}.inactive[svelte-xyz]{color:blue}
\ No newline at end of file
+.active.svelte-xyz{color:red}.inactive.svelte-xyz{color:blue}
\ No newline at end of file
diff --git a/test/css/samples/unused-selector/expected.css b/test/css/samples/unused-selector/expected.css
index 6c4e704d2c..431f704106 100644
--- a/test/css/samples/unused-selector/expected.css
+++ b/test/css/samples/unused-selector/expected.css
@@ -1 +1 @@
-.foo[svelte-xyz]{color:red}
\ No newline at end of file
+.foo.svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js
index 8520eae5a7..11cd7e4c0c 100644
--- a/test/js/samples/collapses-text-around-comments/expected-bundle.js
+++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js
@@ -205,7 +205,7 @@ function encapsulateStyles(node) {
 function add_css() {
 	var style = createElement("style");
 	style.id = 'svelte-2794052100-style';
-	style.textContent = "p[svelte-2794052100],[svelte-2794052100] p{color:red}";
+	style.textContent = "p.svelte-2794052100,.svelte-2794052100 p{color:red}";
 	appendNode(style, document.head);
 }
 
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index 17e612b644..e20a777271 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -12,7 +12,7 @@ function encapsulateStyles(node) {
 function add_css() {
 	var style = createElement("style");
 	style.id = 'svelte-2794052100-style';
-	style.textContent = "p[svelte-2794052100],[svelte-2794052100] p{color:red}";
+	style.textContent = "p.svelte-2794052100,.svelte-2794052100 p{color:red}";
 	appendNode(style, document.head);
 }
 
diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js
index fb4f540eea..7a6a2964e0 100644
--- a/test/js/samples/css-media-query/expected-bundle.js
+++ b/test/js/samples/css-media-query/expected-bundle.js
@@ -197,7 +197,7 @@ function encapsulateStyles(node) {
 function add_css() {
 	var style = createElement("style");
 	style.id = 'svelte-3905933315-style';
-	style.textContent = "@media(min-width: 1px){div[svelte-3905933315],[svelte-3905933315] div{color:red}}";
+	style.textContent = "@media(min-width: 1px){div.svelte-3905933315,.svelte-3905933315 div{color:red}}";
 	appendNode(style, document.head);
 }
 
diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
index 6e03ca0a0a..978a35d953 100644
--- a/test/js/samples/css-media-query/expected.js
+++ b/test/js/samples/css-media-query/expected.js
@@ -8,7 +8,7 @@ function encapsulateStyles(node) {
 function add_css() {
 	var style = createElement("style");
 	style.id = 'svelte-3905933315-style';
-	style.textContent = "@media(min-width: 1px){div[svelte-3905933315],[svelte-3905933315] div{color:red}}";
+	style.textContent = "@media(min-width: 1px){div.svelte-3905933315,.svelte-3905933315 div{color:red}}";
 	appendNode(style, document.head);
 }
 
diff --git a/test/server-side-rendering/samples/styles-nested/_actual.css b/test/server-side-rendering/samples/styles-nested/_actual.css
index e0b5eb0a7c..3098a0db49 100644
--- a/test/server-side-rendering/samples/styles-nested/_actual.css
+++ b/test/server-side-rendering/samples/styles-nested/_actual.css
@@ -1,2 +1,2 @@
-div[svelte-724714405],[svelte-724714405] div{color:red}
-div[svelte-300476157],[svelte-300476157] div{color:green}
\ No newline at end of file
+div.svelte-724714405,.svelte-724714405 div{color:red}
+div.svelte-300476157,.svelte-300476157 div{color:green}
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles-nested/_expected.css b/test/server-side-rendering/samples/styles-nested/_expected.css
index e0b5eb0a7c..3098a0db49 100644
--- a/test/server-side-rendering/samples/styles-nested/_expected.css
+++ b/test/server-side-rendering/samples/styles-nested/_expected.css
@@ -1,2 +1,2 @@
-div[svelte-724714405],[svelte-724714405] div{color:red}
-div[svelte-300476157],[svelte-300476157] div{color:green}
\ No newline at end of file
+div.svelte-724714405,.svelte-724714405 div{color:red}
+div.svelte-300476157,.svelte-300476157 div{color:green}
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles/_actual.css b/test/server-side-rendering/samples/styles/_actual.css
index dec1fe76dc..f57e4a0568 100644
--- a/test/server-side-rendering/samples/styles/_actual.css
+++ b/test/server-side-rendering/samples/styles/_actual.css
@@ -1 +1 @@
-div[svelte-724714405],[svelte-724714405] div{color:red}
\ No newline at end of file
+div.svelte-724714405,.svelte-724714405 div{color:red}
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/styles/_expected.css b/test/server-side-rendering/samples/styles/_expected.css
index dec1fe76dc..f57e4a0568 100644
--- a/test/server-side-rendering/samples/styles/_expected.css
+++ b/test/server-side-rendering/samples/styles/_expected.css
@@ -1 +1 @@
-div[svelte-724714405],[svelte-724714405] div{color:red}
\ No newline at end of file
+div.svelte-724714405,.svelte-724714405 div{color:red}
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css-cascade-false/output.css b/test/sourcemaps/samples/css-cascade-false/output.css
index 754b2e7aa2..976fe0b43d 100644
--- a/test/sourcemaps/samples/css-cascade-false/output.css
+++ b/test/sourcemaps/samples/css-cascade-false/output.css
@@ -1,2 +1,2 @@
-.foo[svelte-1719932608]{color:red}
+.foo.svelte-1719932608{color:red}
 /*# sourceMappingURL=output.css.map */
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css-cascade-false/output.css.map b/test/sourcemaps/samples/css-cascade-false/output.css.map
index a39731fef4..19575fe72a 100644
--- a/test/sourcemaps/samples/css-cascade-false/output.css.map
+++ b/test/sourcemaps/samples/css-cascade-false/output.css.map
@@ -8,5 +8,5 @@
     "<p class='foo'>red</p>\n\n<style>\n\t.foo {\n\t\tcolor: red;\n\t}\n</style>"
   ],
   "names": [],
-  "mappings": "AAGC,IAAI,mBAAC,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
+  "mappings": "AAGC,IAAI,kBAAC,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
 }
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css/output.css b/test/sourcemaps/samples/css/output.css
index acc01832b4..e511c424ea 100644
--- a/test/sourcemaps/samples/css/output.css
+++ b/test/sourcemaps/samples/css/output.css
@@ -1,2 +1,2 @@
-[svelte-1719932608].foo,[svelte-1719932608] .foo{color:red}
+.svelte-1719932608.foo,.svelte-1719932608 .foo{color:red}
 /*# sourceMappingURL=output.css.map */
\ No newline at end of file
diff --git a/test/sourcemaps/samples/css/output.css.map b/test/sourcemaps/samples/css/output.css.map
index 35bbb2299a..19df3abda0 100644
--- a/test/sourcemaps/samples/css/output.css.map
+++ b/test/sourcemaps/samples/css/output.css.map
@@ -8,5 +8,5 @@
     "<p class='foo'>red</p>\n\n<style>\n\t.foo {\n\t\tcolor: red;\n\t}\n</style>"
   ],
   "names": [],
-  "mappings": "AAGC,gDAAK,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
+  "mappings": "AAGC,8CAAK,CAAC,AACL,KAAK,CAAE,GAAG,AACX,CAAC"
 }
\ No newline at end of file