diff --git a/components/layout/flexbox/layout.rs b/components/layout/flexbox/layout.rs
index 6a4e3f386b1..51e05053fdb 100644
--- a/components/layout/flexbox/layout.rs
+++ b/components/layout/flexbox/layout.rs
@@ -802,7 +802,7 @@ impl FlexContainer {
if fallback_is_needed {
(resolved_align_content, is_safe) = match resolved_align_content {
- AlignFlags::STRETCH => (AlignFlags::FLEX_START, true),
+ AlignFlags::STRETCH => (AlignFlags::FLEX_START, false),
AlignFlags::SPACE_BETWEEN => (AlignFlags::FLEX_START, true),
AlignFlags::SPACE_AROUND => (AlignFlags::CENTER, true),
AlignFlags::SPACE_EVENLY => (AlignFlags::CENTER, true),
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 6ae1705fce9..bb5db320efe 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -170987,6 +170987,19 @@
{}
]
],
+ "align-content-007.htm": [
+ "33d217d1671898f43c3e221dd6305401298eab6a",
+ [
+ null,
+ [
+ [
+ "/css/reference/ref-filled-green-200px-square.html",
+ "=="
+ ]
+ ],
+ {}
+ ]
+ ],
"align-content-wrap-004.html": [
"161832190a2a3088ab3b9ad198d4e3083a291551",
[
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini b/tests/wpt/meta/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
deleted file mode 100644
index f13dcc89a05..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-align-self-baseline-horiz-003.xhtml]
- expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini b/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini
index 9881852c542..8bdac789b97 100644
--- a/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini
+++ b/tests/wpt/meta/css/css-flexbox/negative-overflow.html.ini
@@ -5,6 +5,9 @@
[.flexbox 11]
expected: FAIL
+ [.flexbox 5]
+ expected: FAIL
+
[.flexbox 8]
expected: FAIL
diff --git a/tests/wpt/tests/css/css-flexbox/align-content-007.htm b/tests/wpt/tests/css/css-flexbox/align-content-007.htm
new file mode 100644
index 00000000000..33d217d1671
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/align-content-007.htm
@@ -0,0 +1,30 @@
+
+
+CSS Test: Fallback alignment of 'align-content: stretch'
+
+
+
+
+
+
+
+
+Test passes if there is a filled green square and no red.
+