diff --git a/components/layout_2020/flexbox/layout.rs b/components/layout_2020/flexbox/layout.rs
index ca90b6d4a74..fa22604f463 100644
--- a/components/layout_2020/flexbox/layout.rs
+++ b/components/layout_2020/flexbox/layout.rs
@@ -721,12 +721,14 @@ impl FlexContainer {
         };
 
         // Implement "unsafe" alignment. "safe" alignment is handled by the fallback process above.
-        let resolved_align_content = self.config.resolve_reversable_flex_alignment(
-            resolved_align_content,
-            flex_context.config.flex_wrap_is_reversed,
-        );
+        let flex_wrap_is_reversed = flex_context.config.flex_wrap_is_reversed;
+        let resolved_align_content = self
+            .config
+            .resolve_reversable_flex_alignment(resolved_align_content, flex_wrap_is_reversed);
         let mut cross_start_position_cursor = match resolved_align_content {
+            AlignFlags::START if flex_wrap_is_reversed => remaining_free_cross_space,
             AlignFlags::START => Au::zero(),
+            AlignFlags::END if flex_wrap_is_reversed => Au::zero(),
             AlignFlags::END => remaining_free_cross_space,
             AlignFlags::CENTER => remaining_free_cross_space / 2,
             AlignFlags::STRETCH => Au::zero(),
@@ -771,7 +773,7 @@ impl FlexContainer {
                     cross_gap;
 
                 let flow_relative_line_position =
-                    match (self.config.flex_axis, self.config.flex_wrap_is_reversed) {
+                    match (self.config.flex_axis, flex_wrap_is_reversed) {
                         (FlexAxis::Row, false) => LogicalVec2 {
                             block: line_cross_start_position,
                             inline: Au::zero(),
diff --git a/tests/wpt/meta/css/css-flexbox/align-content-wrap-005.html.ini b/tests/wpt/meta/css/css-flexbox/align-content-wrap-005.html.ini
deleted file mode 100644
index c19c93543f2..00000000000
--- a/tests/wpt/meta/css/css-flexbox/align-content-wrap-005.html.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[align-content-wrap-005.html]
-  [.flexitem 1]
-    expected: FAIL
-
-  [.flexitem 2]
-    expected: FAIL
-
-  [.flexitem 3]
-    expected: FAIL
-
-  [.flexitem 4]
-    expected: FAIL
-
-  [.flexitem 5]
-    expected: FAIL
-
-  [.flexitem 6]
-    expected: FAIL
-
-  [.flexitem 7]
-    expected: FAIL
-
-  [.flexitem 8]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-safe-overflow-position-002.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-safe-overflow-position-002.html.ini
deleted file mode 100644
index 59f0ee2071e..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-safe-overflow-position-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-safe-overflow-position-002.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-safe-overflow-position-005.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-safe-overflow-position-005.html.ini
deleted file mode 100644
index 43358703cf5..00000000000
--- a/tests/wpt/meta/css/css-flexbox/flexbox-safe-overflow-position-005.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[flexbox-safe-overflow-position-005.html]
-  expected: FAIL