diff --git a/css/CSS2/fonts/WEB_FEATURES.yml b/css/CSS2/fonts/WEB_FEATURES.yml
index 7d375b92ff645b..e40fe18fb74fb1 100644
--- a/css/CSS2/fonts/WEB_FEATURES.yml
+++ b/css/CSS2/fonts/WEB_FEATURES.yml
@@ -1,4 +1,8 @@
 features:
+- name: font-shorthand
+  files:
+  - font-0*
+  - font-1*
 - name: font-size
   files:
   - font-size-*
diff --git a/css/css-fonts/WEB_FEATURES.yml b/css/css-fonts/WEB_FEATURES.yml
index eb96311e591a5d..e96f0572cdd434 100644
--- a/css/css-fonts/WEB_FEATURES.yml
+++ b/css/css-fonts/WEB_FEATURES.yml
@@ -102,3 +102,6 @@ features:
 - name: font-weight
   files:
   - font-weight-*
+- name: font-shorthand
+  files:
+  - font-shorthand-*
diff --git a/css/css-fonts/parsing/WEB_FEATURES.yml b/css/css-fonts/parsing/WEB_FEATURES.yml
index 58524e6e9b3f8e..102c8ef3e09e76 100644
--- a/css/css-fonts/parsing/WEB_FEATURES.yml
+++ b/css/css-fonts/parsing/WEB_FEATURES.yml
@@ -14,6 +14,10 @@ features:
 - name: font-size-adjust
   files:
   - font-size-adjust-*
+- name: font-shorthand
+  files:
+  - font-valid.html
+  - font-invalid.html
 - name: font-synthesis
   files:
   - font-synthesis-computed.html