diff --git a/sass/griddle/_grid.scss b/sass/griddle/_grid.scss
index 6ddae74..c28bc42 100644
--- a/sass/griddle/_grid.scss
+++ b/sass/griddle/_grid.scss
@@ -1,11 +1,11 @@
 @mixin grid($grid, $gap) {
   display: grid;
-  grid-template-columns: $grid;
   grid-gap: $gap;
+  grid-template-columns: $grid;
 }
 
 @mixin vertical-grid($grid, $gap) {
   display: grid;
-  grid-template-rows: $grid;
   grid-row-gap: $gap;
+  grid-template-rows: $grid;
 }
diff --git a/tests/fixtures/grid.scss b/tests/fixtures/grid.scss
index becb080..51eea9e 100644
--- a/tests/fixtures/grid.scss
+++ b/tests/fixtures/grid.scss
@@ -12,8 +12,8 @@
 
       @include expect {
         display: grid;
-        grid-template-columns: 100px 1fr 2fr;
         grid-gap: 1em;
+        grid-template-columns: 100px 1fr 2fr;
       }
     }
   }
@@ -27,8 +27,8 @@
 
       @include expect {
         display: grid;
-        grid-template-rows: repeat(12, 1fr);
         grid-row-gap: 1em;
+        grid-template-rows: repeat(12, 1fr);
       }
     }
   }
diff --git a/tests/fixtures/span.scss b/tests/fixtures/span.scss
index dafb15f..29059bb 100644
--- a/tests/fixtures/span.scss
+++ b/tests/fixtures/span.scss
@@ -11,7 +11,7 @@
       }
 
       @include expect {
-        grid-column: 1/span 3;
+        grid-column: 1/span 3; // sass-lint:disable-line space-around-operator
       }
     }
   }
@@ -24,7 +24,7 @@
       }
 
       @include expect {
-        grid-row: 1/span 3;
+        grid-row: 1/span 3; // sass-lint:disable-line space-around-operator
       }
     }
   }