diff --git a/components/layout_2020/table/layout.rs b/components/layout_2020/table/layout.rs
index acb24445b28..bfd0b94ca12 100644
--- a/components/layout_2020/table/layout.rs
+++ b/components/layout_2020/table/layout.rs
@@ -240,15 +240,11 @@ impl Zero for CellOrTrackMeasure {
 
 impl<'a> TableLayout<'a> {
     fn new(table: &'a Table) -> TableLayout<'a> {
-        // It's not clear whether `inline-size: stretch` allows fixed table mode or not,
-        // we align with Gecko and Blink.
-        // <https://github.com/w3c/csswg-drafts/issues/10937>.
-        let is_in_fixed_mode = table.style.get_table().clone_table_layout() ==
-            TableLayoutMode::Fixed &&
-            !matches!(
-                table.style.box_size(table.style.writing_mode).inline,
-                Size::Initial | Size::MaxContent
-            );
+        // The CSSWG resolved that only `inline-size: auto` can prevent fixed table mode.
+        // <https://github.com/w3c/csswg-drafts/issues/10937#issuecomment-2669150397>
+        let style = &table.style;
+        let is_in_fixed_mode = style.get_table().table_layout == TableLayoutMode::Fixed &&
+            !style.box_size(style.writing_mode).inline.is_initial();
         Self {
             table,
             pbm: PaddingBorderMargin::zero(),
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 3d9ae7c946f..28ef2f13014 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -596238,7 +596238,7 @@
       ]
      ],
      "fixed-layout-2.html": [
-      "8b805af7669ed914dc5f0d007a2ff8171f45d60a",
+      "d751954714cd7b8c1f5b87182d1025474c5c4939",
       [
        null,
        {}
diff --git a/tests/wpt/meta/css/css-tables/fixed-layout-2.html.ini b/tests/wpt/meta/css/css-tables/fixed-layout-2.html.ini
deleted file mode 100644
index 387f3f4261a..00000000000
--- a/tests/wpt/meta/css/css-tables/fixed-layout-2.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[fixed-layout-2.html]
-  [max-content]
-    expected: FAIL
diff --git a/tests/wpt/tests/css/css-tables/fixed-layout-2.html b/tests/wpt/tests/css/css-tables/fixed-layout-2.html
index 8b805af7669..d751954714c 100644
--- a/tests/wpt/tests/css/css-tables/fixed-layout-2.html
+++ b/tests/wpt/tests/css/css-tables/fixed-layout-2.html
@@ -3,6 +3,7 @@
 <link rel="author" title="Oriol Brufau" href="obrufau@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-tables-3/#in-fixed-mode">
 <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/10937">
+<meta name="assert" content="Fixed table layout is triggered except when inline-size is auto.">
 <link rel="stylesheet" href="./support/base.css">
 
 <style>
@@ -52,26 +53,25 @@ x-td > div {
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-let sizeData = {
-  "10px": true,
-  "100%": true,
-  "calc(10px + 100%)": true,
-  "auto": false,
-  "min-content": true,
-  "max-content": true,
-  "fit-content": true,
-  "calc-size(any, 10px + 100%)": true,
+let sizes = [
+  "10px",
+  "100%",
+  "calc(10px + 100%)",
+  "auto",
+  "min-content",
+  "max-content",
+  "fit-content",
+  "calc-size(any, 10px + 100%)",
+  "fit-content(0)",
+  "stretch",
+  "contain",
 
-  // These expectations are tentative, see https://github.com/w3c/csswg-drafts/issues/10937
-  "fit-content(0)": true,
-  "stretch": true,
-
-  // These are non-standard, expect the most popular behavior among the supporting implementations.
-  "-moz-available": true,
-  "-webkit-fill-available": true,
-  "intrinsic": true,
-  "min-intrinsic": true,
-};
+  // These are non-standard sizes.
+  "-moz-available",
+  "-webkit-fill-available",
+  "intrinsic",
+  "min-intrinsic",
+];
 
 function checkSize(size, allowsFixed) {
   let fragment = template.content.cloneNode(true);
@@ -101,8 +101,9 @@ function checkSize(size, allowsFixed) {
   }, size);
 }
 
-for (let [size, allowsFixed] of Object.entries(sizeData)) {
+for (let size of sizes) {
   if (CSS.supports("width", size)) {
+    let allowsFixed = size !== "auto";
     checkSize(size, allowsFixed);
 
     // calc-size() should trigger fixed table layout.