diff --git a/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html b/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html
new file mode 100644
index 00000000000000..3d1949fc3fa3a1
--- /dev/null
+++ b/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-lr.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: minimum contribution with baseline-alignment shim</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#algo-content" title="11.5. Resolve Intrinsic Track Sizes">
+<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that grid items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area.">
+<style>
+.grid {
+  display: grid;
+  position: relative;
+  font-size: 0;
+  height: 0;
+  width: 0;
+  margin-bottom: 125px;
+  grid-template-rows: 50px 50px;
+  justify-items: baseline;
+}
+.item1, .item2 {
+  writing-mode: vertical-lr;
+}
+.item1 {
+  padding-left: 25px;
+  background: yellow;
+}
+.item2 {
+  padding-right: 25px;
+  background: magenta;
+}
+.item1::before, .item2::before {
+  content: '';
+  display: inline-block;
+  width: 25px;
+  height: 25px;
+  vertical-align: top;
+}
+.item2::before {
+  vertical-align: bottom;
+}
+.area {
+  position: absolute;
+  z-index: -1;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  grid-column: 1 / 2;
+  grid-row: 1 / 3;
+  background: cyan;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<div id="log"></div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 0px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="75" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 75px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="75" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 88px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="88" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 100px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 150px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, auto);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<script>
+checkLayout(".grid");
+</script>
diff --git a/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html b/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html
new file mode 100644
index 00000000000000..e56de9f1b3dae0
--- /dev/null
+++ b/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: minimum contribution with baseline-alignment shim</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#algo-content" title="11.5. Resolve Intrinsic Track Sizes">
+<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that grid items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area.">
+<style>
+.grid {
+  display: grid;
+  position: relative;
+  font-size: 0;
+  height: 0;
+  width: 0;
+  margin-bottom: 125px;
+  grid-template-rows: 50px 50px;
+  justify-items: baseline;
+}
+.item1, .item2 {
+  writing-mode: vertical-rl;
+}
+.item1 {
+  padding-left: 25px;
+  background: yellow;
+}
+.item2 {
+  padding-right: 25px;
+  background: magenta;
+}
+.item1::before, .item2::before {
+  content: '';
+  display: inline-block;
+  width: 25px;
+  height: 25px;
+  vertical-align: top;
+}
+.item2::before {
+  vertical-align: bottom;
+}
+.area {
+  position: absolute;
+  z-index: -1;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  grid-column: 1 / 2;
+  grid-row: 1 / 3;
+  background: cyan;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<div id="log"></div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 0px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="75" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 75px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="75" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 88px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="88" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 100px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, 150px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-columns: minmax(auto, auto);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<script>
+checkLayout(".grid");
+</script>
diff --git a/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html b/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html
new file mode 100644
index 00000000000000..2bd37eb0f0da59
--- /dev/null
+++ b/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: minimum contribution with baseline-alignment shim</title>
+<link rel="author" title="Oriol Brufau" href="mailto:obrufau@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#algo-content" title="11.5. Resolve Intrinsic Track Sizes">
+<meta name="assert" content="Checks that the minimum contribution takes the baseline-alignment shim into account when calculating the outer size that grid items would have if their preferred size were their minimum size. Also checks that the shim is used again when clamping the automatic minimum size to less than or equal to the stretch fit into the grid area.">
+<style>
+.grid {
+  display: grid;
+  position: relative;
+  font-size: 0;
+  height: 0;
+  width: 0;
+  margin-bottom: 125px;
+  grid-template-columns: 50px 50px;
+  align-items: baseline;
+}
+.item1 {
+  padding-top: 25px;
+  background: yellow;
+}
+.item2 {
+  padding-bottom: 25px;
+  background: magenta;
+}
+.item1::before, .item2::before {
+  content: '';
+  display: inline-block;
+  width: 25px;
+  height: 25px;
+  vertical-align: bottom;
+}
+.item2::before {
+  vertical-align: top;
+}
+.area {
+  position: absolute;
+  z-index: -1;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  grid-column: 1 / 3;
+  grid-row: 1 / 2;
+  background: cyan;
+}
+</style>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
+<div id="log"></div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 0px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="75"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 75px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="75"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 88px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="88"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 100px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, 150px);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<div class="grid" style="grid-template-rows: minmax(auto, auto);">
+  <div class="item1" data-offset-x="0" data-offset-y="0"></div>
+  <div class="item2" data-offset-x="50" data-offset-y="50"></div>
+  <div class="area" data-expected-width="100" data-expected-height="100"></div>
+</div>
+
+<script>
+checkLayout(".grid");
+</script>
