diff --git a/css-grid-1/grid-items/grid-minimum-size-grid-items-019.html b/css-grid-1/grid-items/grid-minimum-size-grid-items-019.html
new file mode 100644
index 0000000..af8fe00
--- /dev/null
+++ b/css-grid-1/grid-items/grid-minimum-size-grid-items-019.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Minimum size of grid items</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
+<link rel="match" href="../../css21/reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="Checks that automatic minimum size gets clamped, so the grid item doesn't overflow the fixed size area.">
+<style>
+#reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+}
+
+#constrained-grid {
+    display: grid;
+    width: 500px;
+    height: 200px;
+    grid: 50% / 20%;
+}
+
+#test-grid-item-overlapping-green {
+    background-color: green;
+}
+
+#content-200x200 {
+    width: 200px;
+    height: 200px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div id="constrained-grid">
+    <div id="test-grid-item-overlapping-green">
+        <div id="content-200x200"></div>
+    </div>
+</div>
diff --git a/css-grid-1/grid-items/grid-minimum-size-grid-items-020.html b/css-grid-1/grid-items/grid-minimum-size-grid-items-020.html
new file mode 100644
index 0000000..d83f473
--- /dev/null
+++ b/css-grid-1/grid-items/grid-minimum-size-grid-items-020.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Minimum size of grid items</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
+<link rel="match" href="../../css21/reference/ref-filled-green-100px-square.xht">
+<meta name="assert" content="Checks that automatic minimum size is clamped if the grid item only spans fixed grid tracks.">
+<style>
+#reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+}
+
+#constrained-grid {
+    display: grid;
+    width: 200px;
+    height: 500px;
+    grid: 10% 30px 20px / 50px 30px 10%;
+}
+
+#test-grid-item-overlapping-green {
+    background-color: green;
+    grid-row: span 3;
+    grid-column: span 3;
+}
+
+#content-200x200 {
+    width: 200px;
+    height: 200px;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div id="reference-overlapped-red"></div>
+<div id="constrained-grid">
+    <div id="test-grid-item-overlapping-green">
+        <div id="content-200x200"></div>
+    </div>
+</div>