diff --git a/css/css-flexbox/auto-height-with-flex.html b/css/css-flexbox/auto-height-with-flex.html
new file mode 100644
index 00000000000000..9151f8cd0979d2
--- /dev/null
+++ b/css/css-flexbox/auto-height-with-flex.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#flex-basis-property">
+<link rel="match" href="reference/auto-height-with-flex-ref.html">
+<meta name="assert" content="This test ensures that a vertical flexbox (with auto height) and a flexitem with flex: 1; will not have 0 set to the flex basis, but to auto instead."/>
+<div style="display: flex; flex-direction: column; border: 1px solid purple;">
+<div>Header</div>
+<div style="flex: 1">Flexible content<br>
+</div>
+</div>
diff --git a/css/css-flexbox/reference/auto-height-with-flex-ref.html b/css/css-flexbox/reference/auto-height-with-flex-ref.html
new file mode 100644
index 00000000000000..d56fe356dcbb6c
--- /dev/null
+++ b/css/css-flexbox/reference/auto-height-with-flex-ref.html
@@ -0,0 +1,5 @@
+<div style="border:1px solid purple;">
+<div>Header</div>
+<div>Flexible content<br>
+</div>
+</div>
