diff --git a/custom-elements/state/tentative/ElementInternals-states.html b/custom-elements/state/ElementInternals-states.html
similarity index 95%
rename from custom-elements/state/tentative/ElementInternals-states.html
rename to custom-elements/state/ElementInternals-states.html
index b71bd0a07dfd5f5..1521a8098a36f0c 100644
--- a/custom-elements/state/tentative/ElementInternals-states.html
+++ b/custom-elements/state/ElementInternals-states.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=help href="https://html.spec.whatwg.org/multipage/custom-elements.html#custom-state-pseudo-class">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/custom-elements/state/META.yml b/custom-elements/state/META.yml
new file mode 100644
index 000000000000000..df335b339e1324d
--- /dev/null
+++ b/custom-elements/state/META.yml
@@ -0,0 +1 @@
+spec: https://html.spec.whatwg.org/multipage/custom-elements.html#custom-state-pseudo-class
diff --git a/custom-elements/state/README.md b/custom-elements/state/README.md
new file mode 100644
index 000000000000000..4104881e0392bf7
--- /dev/null
+++ b/custom-elements/state/README.md
@@ -0,0 +1,2 @@
+Tests for [Custom State Pseudo
+Class](https://html.spec.whatwg.org/multipage/custom-elements.html#custom-state-pseudo-class)
diff --git a/custom-state-pseudo-class/custom-state-set-strong-ref.tentative.html b/custom-elements/state/custom-state-set-strong-ref.html
similarity index 90%
rename from custom-state-pseudo-class/custom-state-set-strong-ref.tentative.html
rename to custom-elements/state/custom-state-set-strong-ref.html
index 8b31f83c7b0aba6..da25943ffa233f3 100644
--- a/custom-state-pseudo-class/custom-state-set-strong-ref.tentative.html
+++ b/custom-elements/state/custom-state-set-strong-ref.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="timeout" content="long">
     <meta name="author" title="Keith Cirkel" href="mailto:wpt@keithcirkel.co.uk" />
-    <link rel="help" href="https://wicg.github.io/custom-state-pseudo-class/" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/custom-elements.html#custom-state-pseudo-class" />
     <title>CustomStateSet doesn't crash after GC on detached node</title>
 
     <script src="/resources/testharness.js"></script>
diff --git a/custom-state-pseudo-class/idlharness.window.js b/custom-elements/state/idlharness.window.js
similarity index 100%
rename from custom-state-pseudo-class/idlharness.window.js
rename to custom-elements/state/idlharness.window.js
diff --git a/custom-state-pseudo-class/state-css-selector-shadow-dom.tentative.html b/custom-elements/state/state-css-selector-shadow-dom.html
similarity index 95%
rename from custom-state-pseudo-class/state-css-selector-shadow-dom.tentative.html
rename to custom-elements/state/state-css-selector-shadow-dom.html
index 62bc9cf9484ddb8..9d86b5d26035476 100644
--- a/custom-state-pseudo-class/state-css-selector-shadow-dom.tentative.html
+++ b/custom-elements/state/state-css-selector-shadow-dom.html
@@ -8,7 +8,7 @@
       title="Keith Cirkel"
       href="mailto:wpt@keithcirkel.co.uk"
     />
-    <link rel="help" href="https://wicg.github.io/custom-state-pseudo-class/" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/custom-elements.html#custom-state-pseudo-class" />
     <title>:state() css selector applies in shadow roots</title>
 
     <script src="/resources/testharness.js"></script>
diff --git a/custom-state-pseudo-class/state-css-selector.tentative.html b/custom-elements/state/state-css-selector.html
similarity index 97%
rename from custom-state-pseudo-class/state-css-selector.tentative.html
rename to custom-elements/state/state-css-selector.html
index dd08442e5eb4625..d29c92722343dd8 100644
--- a/custom-state-pseudo-class/state-css-selector.tentative.html
+++ b/custom-elements/state/state-css-selector.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="timeout" content="long">
     <meta name="author" title="Keith Cirkel" href="mailto:wpt@keithcirkel.co.uk" />
-    <link rel="help" href="https://wicg.github.io/custom-state-pseudo-class/" />
+    <link rel="help" href="https://html.spec.whatwg.org/multipage/custom-elements.html#custom-state-pseudo-class" />
     <title>:state() css selector applies</title>
 
     <script src="/resources/testharness.js"></script>
diff --git a/custom-elements/state/tentative/state-pseudo-class.html b/custom-elements/state/state-pseudo-class.html
similarity index 97%
rename from custom-elements/state/tentative/state-pseudo-class.html
rename to custom-elements/state/state-pseudo-class.html
index 684540fdfac41ee..4e2ee0b7790548e 100644
--- a/custom-elements/state/tentative/state-pseudo-class.html
+++ b/custom-elements/state/state-pseudo-class.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel=help href="https://html.spec.whatwg.org/multipage/custom-elements.html#custom-state-pseudo-class">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <style>
diff --git a/custom-elements/state/tentative/README.md b/custom-elements/state/tentative/README.md
deleted file mode 100644
index b11784bd07e689b..000000000000000
--- a/custom-elements/state/tentative/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Tests for [Custom State Pseudo Class](https://wicg.github.io/custom-state-pseudo-class/)
diff --git a/custom-state-pseudo-class/META.yml b/custom-state-pseudo-class/META.yml
deleted file mode 100644
index ee34d8b900423cd..000000000000000
--- a/custom-state-pseudo-class/META.yml
+++ /dev/null
@@ -1 +0,0 @@
-spec: https://wicg.github.io/custom-state-pseudo-class/
