diff --git a/features/flexbox-gap.yml b/features/flexbox-gap.yml
index 1fd011a9661..384d70e61cd 100644
--- a/features/flexbox-gap.yml
+++ b/features/flexbox-gap.yml
@@ -1,5 +1,5 @@
 name: Flexbox gap
 description: The `gap` CSS property in a flexbox layout sets the size of the space between items.
 spec: https://drafts.csswg.org/css-align-3/#gaps
-group: layout
+group: flexbox
 caniuse: flexbox-gap
diff --git a/features/flexbox.yml b/features/flexbox.yml
index 149ca3d7524..19a691f31d2 100644
--- a/features/flexbox.yml
+++ b/features/flexbox.yml
@@ -1,7 +1,7 @@
 name: Flexbox
 description: Flexbox is a one-dimensional layout system, which places content either horizontally or vertically, with optional wrapping.
 spec: https://drafts.csswg.org/css-flexbox-1/
-group: layout
+group: flexbox
 caniuse: flexbox
 # Status is manually set to match https://caniuse.com/flexbox.
 # TODO: https://github.com/web-platform-dx/web-features/pull/1227
diff --git a/groups/flexbox.yml b/groups/flexbox.yml
new file mode 100644
index 00000000000..bfcdb84d771
--- /dev/null
+++ b/groups/flexbox.yml
@@ -0,0 +1,3 @@
+# https://drafts.csswg.org/css-flexbox-1/
+name: Flexbox
+parent: layout