diff --git a/custom-elements/WEB_FEATURES.yml b/custom-elements/WEB_FEATURES.yml
index e77a8695bdd8f4..4b07aa6e72f303 100644
--- a/custom-elements/WEB_FEATURES.yml
+++ b/custom-elements/WEB_FEATURES.yml
@@ -2,13 +2,14 @@ features:
 - name: autonomous-custom-elements
   files:
   - "*"
-  # Exclude customized built-in elements. Keep in sync with below list.
+  # Exclude newer and more specific features. Keep in sync with below lists.
   - "!builtin-coverage.html"
   - "!customized-built-in-constructor-exceptions.html"
   - "!Document-createElement-customized-builtins.html"
   - "!Document-createElementNS-customized-builtins.html"
   - "!HTMLElement-constructor-customized-builtins.html"
   - "!pseudo-class-defined-customized-builtins.html"
+  - "!behaves-like-button-with-command.tentative.html"
 - name: customized-built-in-elements
   files:
   # Keep in sync with above list.
@@ -18,3 +19,7 @@ features:
   - Document-createElementNS-customized-builtins.html
   - HTMLElement-constructor-customized-builtins.html
   - pseudo-class-defined-customized-builtins.html
+- name: invoker-commands
+  files:
+  # Keep in sync with above list.
+  - behaves-like-button-with-command.tentative.html
diff --git a/html/semantics/forms/the-button-element/WEB_FEATURES.yml b/html/semantics/forms/the-button-element/WEB_FEATURES.yml
index f5a2aeaf4f829a..134bbaceb8c2c6 100644
--- a/html/semantics/forms/the-button-element/WEB_FEATURES.yml
+++ b/html/semantics/forms/the-button-element/WEB_FEATURES.yml
@@ -8,3 +8,7 @@ features:
   - button-validity.html
   - button-willvalidate-readonly-attribute.html
   - button-willvalidate.html
+- name: invoker-commands
+  files:
+  - button-click-resets-with-commandfor.tentative.html
+  - button-click-submits-with-commandfor.tentative.html
diff --git a/html/semantics/the-button-element/command-and-commandfor/WEB_FEATURES.yml b/html/semantics/the-button-element/command-and-commandfor/WEB_FEATURES.yml
new file mode 100644
index 00000000000000..ae17e1ea222484
--- /dev/null
+++ b/html/semantics/the-button-element/command-and-commandfor/WEB_FEATURES.yml
@@ -0,0 +1,3 @@
+features:
+- name: invoker-commands
+  files: "**"