diff --git a/test/css/samples/attribute-selector-bind/expected.css b/test/css/samples/attribute-selector-bind/expected.css
index 9dc2fcc42f..20543c5c8e 100644
--- a/test/css/samples/attribute-selector-bind/expected.css
+++ b/test/css/samples/attribute-selector-bind/expected.css
@@ -1 +1 @@
-details[open].svelte-xyz.svelte-xyz{color:red}
\ No newline at end of file
+details[open].svelte-xyz{color:red}
\ No newline at end of file
diff --git a/test/css/samples/attribute-selector-only-name/expected.css b/test/css/samples/attribute-selector-only-name/expected.css
index 3ff721d491..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.svelte-xyz{color:red}[baz].svelte-xyz.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 7199e49c00..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.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 1a8bdff7c6..d466e8df96 100644
--- a/test/css/samples/basic/expected.css
+++ b/test/css/samples/basic/expected.css
@@ -1 +1 @@
-div.svelte-xyz.svelte-xyz{color:red}
\ No newline at end of file
+div.svelte-xyz{color:red}
\ 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 2c3986541b..c2bd56375b 100644
--- a/test/css/samples/css-vars/expected.css
+++ b/test/css/samples/css-vars/expected.css
@@ -1 +1 @@
-:root{--root-test:20}div.svelte-xyz.svelte-xyz{--test:10}
\ No newline at end of file
+:root{--root-test:20}div.svelte-xyz{--test:10}
\ No newline at end of file
diff --git a/test/css/samples/directive-special-character/expected.css b/test/css/samples/directive-special-character/expected.css
index 730df36d91..8b25d59d2e 100644
--- a/test/css/samples/directive-special-character/expected.css
+++ b/test/css/samples/directive-special-character/expected.css
@@ -1 +1 @@
-.foo\:bar.svelte-xyz.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/empty-rule-dev/expected.css b/test/css/samples/empty-rule-dev/expected.css
index cb3cea0c0d..4013e47e5d 100644
--- a/test/css/samples/empty-rule-dev/expected.css
+++ b/test/css/samples/empty-rule-dev/expected.css
@@ -1 +1 @@
-.foo.svelte-xyz.svelte-xyz{}
\ No newline at end of file
+.foo.svelte-xyz{}
\ No newline at end of file
diff --git a/test/css/samples/global-keyframes/expected.css b/test/css/samples/global-keyframes/expected.css
index 3b70bae786..8e716d136d 100644
--- a/test/css/samples/global-keyframes/expected.css
+++ b/test/css/samples/global-keyframes/expected.css
@@ -1 +1 @@
-@keyframes why{0%{color:red}100%{color:blue}}.animated.svelte-xyz.svelte-xyz{animation:why 2s}.also-animated.svelte-xyz.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/keyframes-autoprefixed/expected.css b/test/css/samples/keyframes-autoprefixed/expected.css
index b1273fead8..d9866778a9 100644
--- a/test/css/samples/keyframes-autoprefixed/expected.css
+++ b/test/css/samples/keyframes-autoprefixed/expected.css
@@ -1 +1 @@
-@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}@-webkit-keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}@-moz-keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}@-o-keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.animated.svelte-xyz.svelte-xyz{-webkit-animation:svelte-xyz-why 2s;animation:svelte-xyz-why 2s}.also-animated.svelte-xyz.svelte-xyz{-webkit-animation:not-defined-here 2s;animation:not-defined-here 2s}
\ No newline at end of file
+@keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}@-webkit-keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}@-moz-keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}@-o-keyframes svelte-xyz-why{0%{color:red}100%{color:blue}}.animated.svelte-xyz{-webkit-animation:svelte-xyz-why 2s;animation:svelte-xyz-why 2s}.also-animated.svelte-xyz{-webkit-animation:not-defined-here 2s;animation:not-defined-here 2s}
\ No newline at end of file
diff --git a/test/css/samples/keyframes-from-to/expected.css b/test/css/samples/keyframes-from-to/expected.css
index 76693ed358..c8ee60194c 100644
--- a/test/css/samples/keyframes-from-to/expected.css
+++ b/test/css/samples/keyframes-from-to/expected.css
@@ -1 +1 @@
-@keyframes svelte-xyz-why{from{color:red}to{color:blue}}.animated.svelte-xyz.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/keyframes/expected.css b/test/css/samples/keyframes/expected.css
index 218aa25223..a6a1176dae 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}}.animated.svelte-xyz.svelte-xyz{animation:svelte-xyz-why 2s}.also-animated.svelte-xyz.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/local-inside-global/expected.css b/test/css/samples/local-inside-global/expected.css
index f960d4c782..40af67afba 100644
--- a/test/css/samples/local-inside-global/expected.css
+++ b/test/css/samples/local-inside-global/expected.css
@@ -1 +1 @@
-div .foo.svelte-xyz.svelte-xyz{color:red}div>.foo.svelte-xyz.svelte-xyz{font-weight:bold}
\ No newline at end of file
+div .foo.svelte-xyz{color:red}div>.foo.svelte-xyz{font-weight:bold}
\ 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 e3ec204b82..d2a288ed72 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{color:red}}
\ No newline at end of file
+@media only screen and (min-width: 400px){div.svelte-xyz{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 d08f53153d..8ea74bf3b1 100644
--- a/test/css/samples/media-query/expected.css
+++ b/test/css/samples/media-query/expected.css
@@ -1 +1 @@
-@media(min-width: 400px){.large-screen.svelte-xyz.svelte-xyz{display:block}}
\ No newline at end of file
+@media(min-width: 400px){.large-screen.svelte-xyz{display:block}}
\ No newline at end of file
diff --git a/test/css/samples/nested/expected.css b/test/css/samples/nested/expected.css
index afdb2c5c8f..87ca7335f6 100644
--- a/test/css/samples/nested/expected.css
+++ b/test/css/samples/nested/expected.css
@@ -1 +1 @@
-.foo.svelte-xyz.svelte-xyz{color:red}.bar.svelte-xyz.svelte-xyz{font-style:italic}
\ No newline at end of file
+.foo.svelte-xyz{color:red}.bar.svelte-xyz{font-style:italic}
\ No newline at end of file
diff --git a/test/css/samples/not-selector/expected.css b/test/css/samples/not-selector/expected.css
index dbc6edd5f6..83a819a9e0 100644
--- a/test/css/samples/not-selector/expected.css
+++ b/test/css/samples/not-selector/expected.css
@@ -1 +1 @@
-.svelte-xyz.svelte-xyz:not(.foo){color:red}
\ No newline at end of file
+.svelte-xyz:not(.foo){color:red}
\ 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 48488b2292..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.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 2c36999901..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.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 cb0b85b62f..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.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 cb0b85b62f..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.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 6c00808dfb..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.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 d2279d908d..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.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 aa540ce5db..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.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 12bd34a49b..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.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 be9e02b82c..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.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 1235588b88..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.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 1235588b88..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.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 55857f37bd..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.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 7a240f6b0e..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.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 8afb336fbd..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.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 e9664c9840..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.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 43eeac51f3..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.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 64760db71b..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.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/expected.css b/test/css/samples/omit-scoping-attribute/expected.css
index 571e07eaf4..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.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/pseudo-element/expected.css b/test/css/samples/pseudo-element/expected.css
index d48d1dcb26..bb380d4041 100644
--- a/test/css/samples/pseudo-element/expected.css
+++ b/test/css/samples/pseudo-element/expected.css
@@ -1 +1 @@
-span.svelte-xyz.svelte-xyz::after{content:'i am a pseudo-element'}span.svelte-xyz.svelte-xyz:first-child{color:red}span.svelte-xyz.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/spread/expected.css b/test/css/samples/spread/expected.css
index 5a38e3716c..dc433318e8 100644
--- a/test/css/samples/spread/expected.css
+++ b/test/css/samples/spread/expected.css
@@ -1 +1 @@
-.foo.svelte-xyz.svelte-xyz{color:red;font-size:2em;font-family:'Comic Sans MS'}
\ No newline at end of file
+.foo.svelte-xyz{color:red;font-size:2em;font-family:'Comic Sans MS'}
\ No newline at end of file
diff --git a/test/css/samples/supports-query/expected.css b/test/css/samples/supports-query/expected.css
index c28067a7af..3fdef34d6e 100644
--- a/test/css/samples/supports-query/expected.css
+++ b/test/css/samples/supports-query/expected.css
@@ -1 +1 @@
-@supports (display: grid){.maybe-grid.svelte-xyz.svelte-xyz{display:grid}}
\ No newline at end of file
+@supports (display: grid){.maybe-grid.svelte-xyz{display:grid}}
\ 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 76460629eb..3eda95e446 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{color:red}
\ No newline at end of file
diff --git a/test/css/samples/unknown-at-rule-with-following-rules/expected.css b/test/css/samples/unknown-at-rule-with-following-rules/expected.css
index 025966cf9c..31c3bf9c6f 100644
--- a/test/css/samples/unknown-at-rule-with-following-rules/expected.css
+++ b/test/css/samples/unknown-at-rule-with-following-rules/expected.css
@@ -1 +1 @@
-div.svelte-xyz.svelte-xyz{@apply --funky-div;}
\ No newline at end of file
+div.svelte-xyz{@apply --funky-div;}
\ 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 025966cf9c..31c3bf9c6f 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{@apply --funky-div;}
\ No newline at end of file
+div.svelte-xyz{@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 02dfae359d..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.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 6c46e9a3c3..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.svelte-xyz{color:red}.inactive.svelte-xyz.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 1235588b88..431f704106 100644
--- a/test/css/samples/unused-selector/expected.css
+++ b/test/css/samples/unused-selector/expected.css
@@ -1 +1 @@
-.foo.svelte-xyz.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/weird-selectors/expected.css b/test/css/samples/weird-selectors/expected.css
index 03d2eb5731..d4ead16751 100644
--- a/test/css/samples/weird-selectors/expected.css
+++ b/test/css/samples/weird-selectors/expected.css
@@ -1 +1 @@
-.-foo.svelte-xyz.svelte-xyz{color:red}[title='['].svelte-xyz.svelte-xyz{color:blue}
\ No newline at end of file
+.-foo.svelte-xyz{color:red}[title='['].svelte-xyz{color:blue}
\ No newline at end of file
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index da32e2da5e..8c0e9d5373 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -16,7 +16,7 @@ import {
 function add_css() {
 	var style = element("style");
 	style.id = "svelte-1a7i8ec-style";
-	style.textContent = "p.svelte-1a7i8ec.svelte-1a7i8ec{color:red}";
+	style.textContent = "p.svelte-1a7i8ec{color:red}";
 	append(document.head, style);
 }
 
diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
index fac7a97ee6..0566c22ddd 100644
--- a/test/js/samples/css-media-query/expected.js
+++ b/test/js/samples/css-media-query/expected.js
@@ -14,7 +14,7 @@ import {
 function add_css() {
 	var style = element("style");
 	style.id = "svelte-1slhpfn-style";
-	style.textContent = "@media(min-width: 1px){div.svelte-1slhpfn.svelte-1slhpfn{color:red}}";
+	style.textContent = "@media(min-width: 1px){div.svelte-1slhpfn{color:red}}";
 	append(document.head, style);
 }
 
diff --git a/test/server-side-rendering/samples/styles-nested/_expected.css b/test/server-side-rendering/samples/styles-nested/_expected.css
index 61ba741dbc..775ae8a91c 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-bzh57p.svelte-bzh57p{color:red}
-div.svelte-4yw8vx.svelte-4yw8vx{color:green}
\ No newline at end of file
+div.svelte-bzh57p{color:red}
+div.svelte-4yw8vx{color:green}
\ 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 15e5c35b89..2025c64f84 100644
--- a/test/server-side-rendering/samples/styles/_expected.css
+++ b/test/server-side-rendering/samples/styles/_expected.css
@@ -1 +1 @@
-div.svelte-bzh57p.svelte-bzh57p{color:red}
\ No newline at end of file
+div.svelte-bzh57p{color:red}
\ No newline at end of file