diff --git a/scss/xy-grid/_classes.scss b/scss/xy-grid/_classes.scss
index ab8b577800..d636c374f3 100644
--- a/scss/xy-grid/_classes.scss
+++ b/scss/xy-grid/_classes.scss
@@ -83,6 +83,7 @@
     @for $i from 1 through $grid-columns {
       // Sizing (percentage)
       .grid-x > .#{$-zf-size}-#{$i} {
+        @include xy-cell-base(shrink);
         @include xy-cell-static($i, false, $gutter-type: padding);
       }
     }
diff --git a/test/visual/xy-grid/combo-grids.html b/test/visual/xy-grid/combo-grids.html
index b4230700fa..f5d94a9797 100644
--- a/test/visual/xy-grid/combo-grids.html
+++ b/test/visual/xy-grid/combo-grids.html
@@ -76,6 +76,28 @@ <h2>Auto and Shrink</h2>
       <div class="cell medium-auto"><div class="demo">Auto on medium</div></div>
     </div>
 
+    <h2>Auto/Shrink with static widths</h2>
+
+    <div class="grid-x grid-padding-x">
+      <div class="cell shrink medium-6 large-12"><div class="demo">Shrink, medium:6, large:12</div></div>
+      <div class="cell auto medium-4 large-12"><div class="demo">Auto, medium:4, large:12</div></div>
+    </div>
+
+    <br>
+
+    <div class="grid-x grid-padding-x">
+      <div class="cell shrink medium-auto large-7"><div class="demo">Shrink, medium:auto, large:7</div></div>
+      <div class="cell auto medium-shrink large-5"><div class="demo">Auto, medium:shrink, large:5</div></div>
+    </div>
+
+    <br>
+
+    <p>The following example must be tested without paddings/margins. See <a href"https://github.com/zurb/foundation-sites/issues/10891">#10891</a></p>
+    <div class="grid-x">
+      <div class="cell medium-auto large-12"><div class="demo">medium:auto, large:12</div></div>
+      <div class="cell medium-shrink large-12"><div class="demo">medium:shrink, large:12</div></div>
+    </div>
+
     <h2>Collapse</h2>
 
     <div class="grid-x grid-margin-x large-margin-collapse">