diff --git a/src/bootlint.js b/src/bootlint.js
index 33fdc9e0..eeda4280 100644
--- a/src/bootlint.js
+++ b/src/bootlint.js
@@ -16,22 +16,23 @@ var LocationIndex = _location.LocationIndex;
 (function (exports) {
     'use strict';
     var NUM_COLS = 12;
-    var COL_REGEX = /\bcol-(xs|sm|md|lg)-(\d{1,2})\b/;
-    var COL_REGEX_G = /\bcol-(xs|sm|md|lg)-(\d{1,2})\b/g;
+    var COL_REGEX = /\bcol(?:-(sm|md|lg|xl))?(?:-(auto|\d{1,2}))?\b/;
+    var COL_REGEX_G = /\bcol(?:-(sm|md|lg|xl))?(?:-(auto|\d{1,2}))?\b/g;
     var COL_CLASSES = [];
-    var SCREENS = ['xs', 'sm', 'md', 'lg'];
+    var SCREENS = ['', 'sm', 'md', 'lg', 'xl'];
     SCREENS.forEach(function (screen) {
-        for (var n = 1; n <= NUM_COLS; n++) {
-            COL_CLASSES.push('.col-' + screen + '-' + n);
+        for (var n = -1; n <= NUM_COLS; n++) {
+            COL_CLASSES.push('.col' + (screen && '-' + screen) + (n < 0 ? '' : '-' + (n || 'auto')));
         }
     });
     var SCREEN2NUM = {
-        xs: 0,
-        sm: 1,
-        md: 2,
-        lg: 3
+        '': 0,
+        'sm': 1,
+        'md': 2,
+        'lg': 3,
+        'xl': 4
     };
-    var NUM2SCREEN = ['xs', 'sm', 'md', 'lg'];
+    var NUM2SCREEN = ['', 'sm', 'md', 'lg', 'xl'];
     var IN_NODE_JS = Boolean(cheerio.load);
     var MIN_JQUERY_VERSION = '1.9.1'; // as of Bootstrap v3.3.0
     var CURRENT_BOOTSTRAP_VERSION = '3.3.7';
@@ -131,11 +132,11 @@ var LocationIndex = _location.LocationIndex;
         var width2screens = {};
         while (true) {
             var match = COL_REGEX_G.exec(classes);
-            if (!match) {
+            if (!match || !match[1] && !match[2]) {
                 break;
             }
-            var screen = match[1];
-            width = match[2];
+            var screen = match[1] || '';
+            width = match[2] || ''; // can also be 'auto'
             var screens = width2screens[width];
             if (!screens) {
                 screens = width2screens[width] = [];
@@ -476,7 +477,6 @@ var LocationIndex = _location.LocationIndex;
         }
     });
     */
-    /*
     addLinter('W009', function lintEmptySpacerCols($, reporter) {
         var selector = COL_CLASSES.map(function (colClass) {
             return colClass + ':not(:last-child)';
@@ -492,18 +492,9 @@ var LocationIndex = _location.LocationIndex;
                 return;
             }
 
-            var colClasses = column.attr('class').split(/\s+/g).filter(function (klass) {
-                return COL_REGEX.test(klass);
-            });
-            colClasses = sortedColumnClasses(colClasses.join(' ')).trim();
-
-            var colRegex = new RegExp('\\b(col-)(' + SCREENS.join('|') + ')(-\\d+)\\b', 'g');
-            var offsetClasses = colClasses.replace(colRegex, '$1$2-offset$3');
-
-            reporter('Using empty spacer columns isn\'t necessary with Bootstrap\'s grid. So instead of having an empty grid column with `class="' + colClasses + '"` , just add `class="' + offsetClasses + '"` to the next grid column.', column);
+            reporter('Using empty spacer columns isn\'t necessary with Bootstrap\'s grid.', column);
         });
     });
-    */
     /*
     addLinter('W010', function lintMediaPulls($, reporter) {
         var mediaPulls = $('.media>.pull-left, .media>.pull-right');
@@ -695,7 +686,6 @@ var LocationIndex = _location.LocationIndex;
         }
     });
     */
-    /*
     addLinter('E005', function lintRowAndColOnSameElem($, reporter) {
         var selector = COL_CLASSES.map(function (col) {
             return '.row' + col;
@@ -703,10 +693,9 @@ var LocationIndex = _location.LocationIndex;
 
         var rowCols = $(selector);
         if (rowCols.length) {
-            reporter('Found both `.row` and `.col-*-*` used on the same element', rowCols);
+            reporter('Found both `.row` and `.col*` used on the same element', rowCols);
         }
     });
-    */
     /*
     addLinter('E006', function lintInputGroupFormControlTypes($, reporter) {
         var selectInputGroups = $('.input-group select');
@@ -759,7 +748,6 @@ var LocationIndex = _location.LocationIndex;
         }
     });
     */
-    /*
     addLinter('E012', function lintGridClassMixedWithInputGroup($, reporter) {
         var selector = COL_CLASSES.map(function (colClass) {
             return '.input-group' + colClass;
@@ -767,35 +755,31 @@ var LocationIndex = _location.LocationIndex;
 
         var badMixes = $(selector);
         if (badMixes.length) {
-            reporter('`.input-group` and `.col-*-*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col-*-*`', badMixes);
+            reporter('`.input-group` and `.col*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col*`', badMixes);
         }
     });
-    */
-    /*
     addLinter('E013', function lintRowChildrenAreCols($, reporter) {
-        var ALLOWED_CHILDREN = COL_CLASSES.concat(['script', '.clearfix', '.bs-customizer-input']);
-        var selector = '.row>*' + ALLOWED_CHILDREN.map(function (colClass) {
+        var ALLOWED_CHILDREN = COL_CLASSES.concat(['script', '.clearfix']);
+        var disallowedChildren = ALLOWED_CHILDREN.map(function (colClass) {
             return ':not(' + colClass + ')';
         }).join('');
+        var selector = '.row>*' + disallowedChildren + ',.form-row>*' + disallowedChildren;
 
         var nonColRowChildren = $(selector);
         if (nonColRowChildren.length) {
-            reporter('Only columns (`.col-*-*`) may be children of `.row`s', nonColRowChildren);
+            reporter('Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s', nonColRowChildren);
         }
     });
-    */
-    /*
     addLinter('E014', function lintColParentsAreRowsOrFormGroups($, reporter) {
         var selector = COL_CLASSES.map(function (colClass) {
-            return '*:not(.row):not(.form-group)>' + colClass + ':not(col):not(th):not(td)';
+            return '*:not(.row):not(.form-row)>' + colClass + ':not(col):not(th):not(td)';
         }).join(',');
 
         var colsOutsideRowsAndFormGroups = $(selector);
         if (colsOutsideRowsAndFormGroups.length) {
-            reporter('Columns (`.col-*-*`) can only be children of `.row`s or `.form-group`s', colsOutsideRowsAndFormGroups);
+            reporter('Columns (`.col*`) can only be children of `.row`s or `.form-row`s', colsOutsideRowsAndFormGroups);
         }
     });
-    */
     /*
     addLinter('E015', function lintInputGroupsWithMultipleAddOnsPerSide($, reporter) {
         var addOnClasses = ['.input-group-addon', '.input-group-btn'];
@@ -944,7 +928,6 @@ var LocationIndex = _location.LocationIndex;
         }
     });
     */
-    /*
     addLinter('E029', function lintRedundantColumnClasses($, reporter) {
         var columns = $(COL_CLASSES.join(','));
         columns.each(function (_index, col) {
@@ -953,27 +936,26 @@ var LocationIndex = _location.LocationIndex;
             var simplifiedClasses = classes;
             var width2screens = width2screensFor(classes);
             var isRedundant = false;
-            for (var width = 1; width <= NUM_COLS; width++) {
-                var screens = width2screens[width];
-                if (!screens) {
-                    continue;
-                }
-                var runs = incrementingRunsFrom(screens);
-                if (!runs.length) {
-                    continue;
-                }
+            for (var width in width2screens) {
+                if (Object.prototype.hasOwnProperty.call(width2screens, width)) {
+                    var screens = width2screens[width];
+                    var runs = incrementingRunsFrom(screens);
+                    if (!runs.length) {
+                        continue;
+                    }
 
-                isRedundant = true;
+                    isRedundant = true;
 
-                for (var i = 0; i < runs.length; i++) {
-                    var run = runs[i];
-                    var min = run[0];
-                    var max = run[1];
+                    for (var i = 0; i < runs.length; i++) {
+                        var run = runs[i];
+                        var min = run[0];
+                        var max = run[1];
 
-                    // remove redundant classes
-                    for (var screenNum = min + 1; screenNum <= max; screenNum++) {
-                        var colClass = 'col-' + NUM2SCREEN[screenNum] + '-' + width;
-                        simplifiedClasses = withoutClass(simplifiedClasses, colClass);
+                        // remove redundant classes
+                        for (var screenNum = min + 1; screenNum <= max; screenNum++) {
+                            var colClass = 'col' + (NUM2SCREEN[screenNum] && '-' + NUM2SCREEN[screenNum]) + (width && '-' + width);
+                            simplifiedClasses = withoutClass(simplifiedClasses, colClass);
+                        }
                     }
                 }
             }
@@ -992,7 +974,6 @@ var LocationIndex = _location.LocationIndex;
             );
         });
     });
-    */
     /*
     addLinter('E030', function lintSoloGlyphiconClasses($, reporter) {
         var missingGlyphiconClass = $('[class*="glyphicon-"]:not(.glyphicon):not(.glyphicon-class)').filter(function () {
@@ -1076,17 +1057,15 @@ var LocationIndex = _location.LocationIndex;
         }
     });
     */
-    /*
     addLinter('E037', function lintColZeros($, reporter) {
         var selector = SCREENS.map(function (screen) {
-            return '.col-' + screen + '-0';
+            return '.col' + (screen && '-' + screen) + '-0';
         }).join(',');
         var elements = $(selector);
         if (elements.length) {
-            reporter('Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes.', elements);
+            reporter('Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes.', elements);
         }
     });
-    */
     /*
     addLinter('E038', function lintMediaPulls($, reporter) {
         var mediaPullsOutsideMedia = $('.media-left, .media-right').filter(function () {
@@ -1227,14 +1206,13 @@ var LocationIndex = _location.LocationIndex;
         }
     });
     */
-    /*
     addLinter('E051', function lintColumnsNoFloats($, reporter) {
         var pullSelector = COL_CLASSES.map(function (col) {
-            return '.pull-left' + col + ',.pull-right' + col;
+            return '.float-left' + col + ',.float-right' + col;
         }).join(',');
         var pulledCols = $(pullSelector);
         if (pulledCols.length) {
-            reporter('`.pull-right` and `.pull-left` must not be used on `.col-*-*` elements', pulledCols);
+            reporter('`.float-right` and `.float-left` must not be used on `.col*` elements', pulledCols);
         }
         var styledSelector = COL_CLASSES.map(function (col) {
             return col + '[style]';
@@ -1244,15 +1222,13 @@ var LocationIndex = _location.LocationIndex;
             return /float\s*:\s*[a-z]+/i.test($(el).attr('style'));
         });
         if (styledCols.length) {
-            reporter('Manually added `float` styles must not be added on `.col-*-*` elements', styledCols);
+            reporter('Manually added `float` styles must not be added on `.col*` elements', styledCols);
         }
     });
-    */
-    /*
     addLinter('E052', function lintRowsNoFloats($, reporter) {
-        var pulledRows = $('.row.pull-right, .row.pull-left');
+        var pulledRows = $('.row.float-right, .row.float-left');
         if (pulledRows.length) {
-            reporter('`.pull-right` and `.pull-left` must not be used on `.row` elements', pulledRows);
+            reporter('`.float-right` and `.float-left` must not be used on `.row` elements', pulledRows);
         }
         var styledRows = $('.row[style]').filter(function (i, el) {
             //test for `float:*` in the style attribute
@@ -1262,7 +1238,6 @@ var LocationIndex = _location.LocationIndex;
             reporter('Manually added `float` styles must not be added on `.row` elements', styledRows);
         }
     });
-    */
     exports._lint = function ($, reporter, disabledIdList, html) {
         var locationIndex = IN_NODE_JS ? new LocationIndex(html) : null;
         var reporterWrapper = IN_NODE_JS ?
diff --git a/test/bootlint_test.js b/test/bootlint_test.js
index 57cbbf42..db374407 100644
--- a/test/bootlint_test.js
+++ b/test/bootlint_test.js
@@ -161,18 +161,16 @@ exports.bootlint = {
         test.done();
     },
     */
-    /*
     'row and column classes on same element': function (test) {
         test.expect(1);
         test.deepEqual(lintHtml(utf8Fixture('grid/row-col-same-elem.html')),
             [
-                'Found both `.row` and `.col-*-*` used on the same element',
-                'Columns (`.col-*-*`) can only be children of `.row`s or `.form-group`s'
+                'Found both `.row` and `.col*` used on the same element',
+                'Columns (`.col*`) can only be children of `.row`s or `.form-row`s'
             ],
-            'should complain when .row and .col-*-* are used on the same element.');
+            'should complain when .row and .col* are used on the same element.');
         test.done();
     },
-    */
     /*
     'row and container classes on same element': function (test) {
         test.expect(2);
@@ -184,7 +182,6 @@ exports.bootlint = {
             'should complain when .row and .container-fluid are used on the same element.');
         test.done();
     },
-    */
     /*
     'remote modals': function (test) {
         test.expect(1);
@@ -319,18 +316,16 @@ exports.bootlint = {
         test.done();
     },
     */
-    /*
     'non-column children of rows': function (test) {
         test.expect(2);
         test.deepEqual(lintHtml(utf8Fixture('grid/non-col-row-children.html')),
-            ['Only columns (`.col-*-*`) may be children of `.row`s'],
+            ['Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s'],
             'should complain when rows have non-column children.');
         test.deepEqual(lintHtml(utf8Fixture('grid/script-child-of-row.html')),
             [],
             'should not complain about <script> child of row');
         test.done();
     },
-    */
     /*
     'multiple columns on the same side of an input group': function (test) {
         test.expect(5);
@@ -483,7 +478,6 @@ exports.bootlint = {
         test.done();
     },
     */
-    /*
     'columns outside of rows and form groups': function (test) {
         test.expect(3);
         test.deepEqual(lintHtml(utf8Fixture('grid/cols-within-row.html')),
@@ -495,12 +489,11 @@ exports.bootlint = {
             'should not complain when columns are within a form group.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/cols-outside-row-and-form-group.html')),
-            ['Columns (`.col-*-*`) can only be children of `.row`s or `.form-group`s'],
+            ['Columns (`.col*`) can only be children of `.row`s or `.form-row`s'],
             'should complain when columns are outside of rows and form groups.'
         );
         test.done();
     },
-    */
     /*
     '.table-responsive on the table itself': function (test) {
         test.expect(2);
@@ -515,7 +508,6 @@ exports.bootlint = {
         test.done();
     },
     */
-    /*
     'redundant grid column classes': function (test) {
         test.expect(2);
         test.deepEqual(lintHtml(utf8Fixture('grid/cols-not-redundant.html')),
@@ -524,23 +516,23 @@ exports.bootlint = {
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/cols-redundant.html')),
             [
-                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="abc col-xs-2 def col-sm-1 ghi col-md-1 jkl col-lg-1"` is redundant and can be simplified to `class="abc def ghi jkl col-xs-2 col-sm-1"`',
-                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-xs-10 abc col-sm-10 def col-md-10 ghi col-lg-12 jkl"` is redundant and can be simplified to `class="abc def ghi jkl col-xs-10 col-lg-12"`',
-                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-xs-6 col-sm-6 col-md-6 col-lg-6"` is redundant and can be simplified to `class="col-xs-6"`',
-                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-xs-5 col-sm-5"` is redundant and can be simplified to `class="col-xs-5"`',
+                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="abc col-2 def col-sm-1 ghi col-md-1 jkl col-lg-1 mno col-xl-1"` is redundant and can be simplified to `class="abc def ghi jkl mno col-2 col-sm-1"`',
+                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-10 abc col-sm-10 def col-md-10 ghi col-lg-10 jkl col-xl-12 mno"` is redundant and can be simplified to `class="abc def ghi jkl mno col-10 col-xl-12"`',
+                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-6 col-sm-6 col-md-6 col-lg-6 col-xl-6"` is redundant and can be simplified to `class="col-6"`',
+                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-5 col-sm-5"` is redundant and can be simplified to `class="col-5"`',
                 'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-sm-4 col-md-4"` is redundant and can be simplified to `class="col-sm-4"`',
-                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-md-3 col-lg-3"` is redundant and can be simplified to `class="col-md-3"`'
+                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-md-3 col-lg-3"` is redundant and can be simplified to `class="col-md-3"`',
+                'Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-lg-2 col-xl-2"` is redundant and can be simplified to `class="col-lg-2"`'
             ],
             'should complain when there are redundant grid column classes.'
         );
         test.done();
     },
-    */
     /*
     'empty spacer grid columns': function (test) {
         test.expect(10);
         test.deepEqual(lintHtml(utf8Fixture('grid/spacer-col/blank-text.html')),
-            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid. So instead of having an empty grid column with `class="col-xs-11"` , just add `class="col-xs-offset-11"` to the next grid column.'],
+            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid.'],
             'should complain when spacer column contains only whitespace text content.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/spacer-col/non-blank-text.html')),
@@ -556,7 +548,7 @@ exports.bootlint = {
             'should not complain when spacer-like column contains child element without text content.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/spacer-col/no-child-no-text.html')),
-            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid. So instead of having an empty grid column with `class="col-xs-11"` , just add `class="col-xs-offset-11"` to the next grid column.'],
+            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid.'],
             'should complain when spacer column is completely empty.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/spacer-col/col-element.html')),
@@ -568,11 +560,11 @@ exports.bootlint = {
             'should not complain when the spacer column is the last column in the row.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/spacer-col/tricky-classes.html')),
-            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid. So instead of having an empty grid column with `class="col-xs-11"` , just add `class="col-xs-offset-11"` to the next grid column.'],
+            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid.'],
             'should process classes named similar to grid column classes correctly.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/spacer-col/multiple-reversed-order.html')),
-            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid. So instead of having an empty grid column with `class="col-xs-11 col-sm-8 col-md-6 col-lg-5"` , just add `class="col-xs-offset-11 col-sm-offset-8 col-md-offset-6 col-lg-offset-5"` to the next grid column.'],
+            ['Using empty spacer columns isn\'t necessary with Bootstrap\'s grid.'],
             'should sort the grid classes in its message and handle multiple grid classes correctly.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/spacer-col/void-elements.html')),
@@ -581,7 +573,6 @@ exports.bootlint = {
         );
         test.done();
     },
-    */
     /*
     '.form-control-feedback without a .has-feedback ancestor': function (test) {
         test.expect(3);
@@ -720,40 +711,39 @@ exports.bootlint = {
         test.done();
     },
     */
-    /*
-    'invalid nonexistent .col-*-0 classes': function (test) {
+
+    'invalid nonexistent .col*-0 classes': function (test) {
         test.expect(4);
-        test.deepEqual(lintHtml(utf8Fixture('grid/col-xs-0.html')),
-            [
-                'Only columns (`.col-*-*`) may be children of `.row`s',
-                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes.'
-            ],
-            'should complain about usage of .col-*-0 class.'
-        );
         test.deepEqual(lintHtml(utf8Fixture('grid/col-sm-0.html')),
             [
-                'Only columns (`.col-*-*`) may be children of `.row`s',
-                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes.'
+                'Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s',
+                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes.'
             ],
-            'should complain about usage of .col-*-0 class.'
+            'should complain about usage of .col-sm-0 class.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/col-md-0.html')),
             [
-                'Only columns (`.col-*-*`) may be children of `.row`s',
-                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes.'
+                'Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s',
+                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes.'
             ],
-            'should complain about usage of .col-*-0 class.'
+            'should complain about usage of .col-md-0 class.'
         );
         test.deepEqual(lintHtml(utf8Fixture('grid/col-lg-0.html')),
             [
-                'Only columns (`.col-*-*`) may be children of `.row`s',
-                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes.'
+                'Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s',
+                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes.'
             ],
             'should complain about usage of .col-lg-0 class.'
         );
+        test.deepEqual(lintHtml(utf8Fixture('grid/col-xl-0.html')),
+            [
+                'Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s',
+                'Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes.'
+            ],
+            'should complain about usage of .col-xl-0 class.'
+        );
         test.done();
     },
-    */
     /*
     'outdated version of Bootstrap': function (test) {
         test.expect(5);
@@ -1048,30 +1038,26 @@ exports.bootlint = {
         test.done();
     },
     */
-    /*
-    '.pull-right/left classes and manual float styles not allowed on .col-*-*': function (test) {
+    '.float-right/left classes and manual float styles not allowed on .col*': function (test) {
         test.expect(1);
         test.deepEqual(lintHtml(utf8Fixture('grid/col-no-float.html')),
             [
-                '`.pull-right` and `.pull-left` must not be used on `.col-*-*` elements',
-                'Manually added `float` styles must not be added on `.col-*-*` elements'
+                '`.float-right` and `.float-left` must not be used on `.col*` elements',
+                'Manually added `float` styles must not be added on `.col*` elements'
             ],
-            'should complain about a `.pull-right/.pull-left` classes on `.col-*-*` AND manual `style="float:left;"/style="float:right;"` on a `.col-*-*`'
+            'should complain about a `.float-right/.float-left` classes on `.col*` AND manual `style="float:left;"/style="float:right;"` on a `.col*`'
         );
         test.done();
     },
-    */
-    /*
-    '.pull-right/left classes and manual float styles not allowed on .row': function (test) {
+    '.float-right/left classes and manual float styles not allowed on .row': function (test) {
         test.expect(1);
         test.deepEqual(lintHtml(utf8Fixture('grid/row-no-float.html')),
             [
-                '`.pull-right` and `.pull-left` must not be used on `.row` elements',
+                '`.float-right` and `.float-left` must not be used on `.row` elements',
                 'Manually added `float` styles must not be added on `.row` elements'
             ],
-            'should complain about a `.pull-right/.pull-left` classes on `.row` AND manual `style="float:left;"/style="float:right;"` on a `.row`'
+            'should complain about a `.float-right/.float-left` classes on `.row` AND manual `style="float:left;"/style="float:right;"` on a `.row`'
         );
         test.done();
     }
-    */
 };
diff --git a/test/_old_fixtures/grid/col-xs-0.html b/test/fixtures/grid/col-0.html
similarity index 84%
rename from test/_old_fixtures/grid/col-xs-0.html
rename to test/fixtures/grid/col-0.html
index 654d3a47..20b29c01 100644
--- a/test/_old_fixtures/grid/col-xs-0.html
+++ b/test/fixtures/grid/col-0.html
@@ -19,14 +19,14 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="col-xs-0">Content</div>
+                <div class="col-0">Content</div>
             </div>
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Only columns (`.col-*-*`) may be children of `.row`s"></li>
-            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes."></li>
+            <li data-lint="Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s"></li>
+            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes."></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/col-lg-0.html b/test/fixtures/grid/col-lg-0.html
similarity index 88%
rename from test/_old_fixtures/grid/col-lg-0.html
rename to test/fixtures/grid/col-lg-0.html
index c924aca1..feff0e86 100644
--- a/test/_old_fixtures/grid/col-lg-0.html
+++ b/test/fixtures/grid/col-lg-0.html
@@ -25,8 +25,8 @@
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Only columns (`.col-*-*`) may be children of `.row`s"></li>
-            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes."></li>
+            <li data-lint="Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s"></li>
+            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes."></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/col-md-0.html b/test/fixtures/grid/col-md-0.html
similarity index 88%
rename from test/_old_fixtures/grid/col-md-0.html
rename to test/fixtures/grid/col-md-0.html
index a04ad3f1..c2b45d88 100644
--- a/test/_old_fixtures/grid/col-md-0.html
+++ b/test/fixtures/grid/col-md-0.html
@@ -25,8 +25,8 @@
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Only columns (`.col-*-*`) may be children of `.row`s"></li>
-            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes."></li>
+            <li data-lint="Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s"></li>
+            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes."></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/col-no-float.html b/test/fixtures/grid/col-no-float.html
similarity index 77%
rename from test/_old_fixtures/grid/col-no-float.html
rename to test/fixtures/grid/col-no-float.html
index e0be9456..70ac48e1 100644
--- a/test/_old_fixtures/grid/col-no-float.html
+++ b/test/fixtures/grid/col-no-float.html
@@ -19,20 +19,20 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="col-xs-6 pull-right">Content</div>
-                <div class="col-md-6 pull-left">Content</div>
+                <div class="col-sm-6 float-right">Content</div>
+                <div class="col-md-6 float-left">Content</div>
             </div>
             
             <div class="row">
-                <div class="col-xs-6" style="float:left">Content</div>
+                <div class="col-sm-6" style="float:left">Content</div>
                 <div class="col-md-6" style="float:right">Content</div>
             </div>
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="`.pull-right` and `.pull-left` must not be used on `.col-*-*` elements"></li>
-            <li data-lint="Manually added `float` styles must not be added on `.col-*-*` elements"></li>
+            <li data-lint="`.float-right` and `.float-left` must not be used on `.col*` elements"></li>
+            <li data-lint="Manually added `float` styles must not be added on `.col*` elements"></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/col-sm-0.html b/test/fixtures/grid/col-sm-0.html
similarity index 88%
rename from test/_old_fixtures/grid/col-sm-0.html
rename to test/fixtures/grid/col-sm-0.html
index 65066f3a..852d1636 100644
--- a/test/_old_fixtures/grid/col-sm-0.html
+++ b/test/fixtures/grid/col-sm-0.html
@@ -25,8 +25,8 @@
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Only columns (`.col-*-*`) may be children of `.row`s"></li>
-            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes."></li>
+            <li data-lint="Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s"></li>
+            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes."></li>
         </ol>
     </body>
 </html>
diff --git a/test/fixtures/grid/col-xl-0.html b/test/fixtures/grid/col-xl-0.html
new file mode 100644
index 00000000..24a23c13
--- /dev/null
+++ b/test/fixtures/grid/col-xl-0.html
@@ -0,0 +1,32 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>Test</title>
+        <!--[if lt IE 9]>
+            <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+            <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+        <![endif]-->
+        <script src="../../lib/jquery.min.js"></script>
+
+        <link rel="stylesheet" href="../../lib/qunit.css">
+        <script src="../../lib/qunit.js"></script>
+        <script src="../../../dist/browser/bootlint.js"></script>
+        <script src="../generic-qunit.js"></script>
+    </head>
+    <body>
+        <div class="container">
+            <div class="row">
+                <div class="col-xl-0">Content</div>
+            </div>
+        </div>
+
+        <div id="qunit"></div>
+        <ol id="bootlint">
+            <li data-lint="Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s"></li>
+            <li data-lint="Column widths must be positive integers (and &lt;= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes."></li>
+        </ol>
+    </body>
+</html>
diff --git a/test/_old_fixtures/grid/cols-not-redundant.html b/test/fixtures/grid/cols-not-redundant.html
similarity index 83%
rename from test/_old_fixtures/grid/cols-not-redundant.html
rename to test/fixtures/grid/cols-not-redundant.html
index 0a6452ba..f057c25c 100644
--- a/test/_old_fixtures/grid/cols-not-redundant.html
+++ b/test/fixtures/grid/cols-not-redundant.html
@@ -19,10 +19,10 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="col-xs-1 col-sm-2 col-md-1 col-lg-2">Single-digit columns</div>
+                <div class="col-1 col-sm-2 col-md-1 col-lg-2 col-xl-1">Single-digit columns</div>
             </div>
             <div class="row">
-                <div class="col-xs-12 col-sm-11 col-md-10 col-lg-11">Double-digit columns</div>
+                <div class="col-12 col-sm-11 col-md-10 col-lg-9 col-xl-10">Double-digit columns</div>
             </div>
         </div>
 
diff --git a/test/_old_fixtures/grid/cols-outside-row-and-form-group.html b/test/fixtures/grid/cols-outside-row-and-form-group.html
similarity index 90%
rename from test/_old_fixtures/grid/cols-outside-row-and-form-group.html
rename to test/fixtures/grid/cols-outside-row-and-form-group.html
index 360c8eaf..ab2acc81 100644
--- a/test/_old_fixtures/grid/cols-outside-row-and-form-group.html
+++ b/test/fixtures/grid/cols-outside-row-and-form-group.html
@@ -25,7 +25,7 @@
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Columns (`.col-*-*`) can only be children of `.row`s or `.form-group`s"></li>
+            <li data-lint="Columns (`.col*`) can only be children of `.row`s or `.form-row`s"></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/cols-redundant.html b/test/fixtures/grid/cols-redundant.html
similarity index 65%
rename from test/_old_fixtures/grid/cols-redundant.html
rename to test/fixtures/grid/cols-redundant.html
index 46c4ad9e..c2b61e63 100644
--- a/test/_old_fixtures/grid/cols-redundant.html
+++ b/test/fixtures/grid/cols-redundant.html
@@ -19,16 +19,16 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="abc col-xs-2 def col-sm-1 ghi col-md-1 jkl col-lg-1">Single-digit columns; sm-lg redundant; random classes interleaved</div>
+                <div class="abc col-2 def col-sm-1 ghi col-md-1 jkl col-lg-1 mno col-xl-1">Single-digit columns; sm-xl redundant; random classes interleaved</div>
             </div>
             <div class="row">
-                <div class="col-xs-10 abc col-sm-10 def col-md-10 ghi col-lg-12 jkl">Double-digit columns; xs-md redundant; random classes interleaved</div>
+                <div class="col-10 abc col-sm-10 def col-md-10 ghi col-lg-10 jkl col-xl-12 mno">Double-digit columns; [default]-lg redundant; random classes interleaved</div>
             </div>
             <div class="row">
-                <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6">xs-lg redundant</div>
+                <div class="col-6 col-sm-6 col-md-6 col-lg-6 col-xl-6">up to xl redundant</div>
             </div>
             <div class="row">
-                <div class="col-xs-5 col-sm-5">xs-sm redundant</div>
+                <div class="col-5 col-sm-5">up to sm redundant</div>
             </div>
             <div class="row">
                 <div class="col-sm-4 col-md-4">sm-md redundant</div>
@@ -36,16 +36,20 @@
             <div class="row">
                 <div class="col-md-3 col-lg-3">md-lg redundant</div>
             </div>
+            <div class="row">
+                <div class="col-lg-2 col-xl-2">lg-xl redundant</div>
+            </div>            
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="abc col-xs-2 def col-sm-1 ghi col-md-1 jkl col-lg-1"` is redundant and can be simplified to `class="abc def ghi jkl col-xs-2 col-sm-1"`'></li>
-            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-xs-10 abc col-sm-10 def col-md-10 ghi col-lg-12 jkl"` is redundant and can be simplified to `class="abc def ghi jkl col-xs-10 col-lg-12"`'></li>
-            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-xs-6 col-sm-6 col-md-6 col-lg-6"` is redundant and can be simplified to `class="col-xs-6"`'></li>
-            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-xs-5 col-sm-5"` is redundant and can be simplified to `class="col-xs-5"`'></li>
+            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="abc col-2 def col-sm-1 ghi col-md-1 jkl col-lg-1 mno col-xl-1"` is redundant and can be simplified to `class="abc def ghi jkl mno col-2 col-sm-1"`'></li>
+            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-10 abc col-sm-10 def col-md-10 ghi col-lg-10 jkl col-xl-12 mno"` is redundant and can be simplified to `class="abc def ghi jkl mno col-10 col-xl-12"`'></li>
+            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-6 col-sm-6 col-md-6 col-lg-6 col-xl-6"` is redundant and can be simplified to `class="col-6"`'></li>
+            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-5 col-sm-5"` is redundant and can be simplified to `class="col-5"`'></li>
             <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-sm-4 col-md-4"` is redundant and can be simplified to `class="col-sm-4"`'></li>
             <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-md-3 col-lg-3"` is redundant and can be simplified to `class="col-md-3"`'></li>
+            <li data-lint='Since grid classes apply to devices with screen widths greater than or equal to the breakpoint sizes (unless overridden by grid classes targeting larger screens), `class="col-lg-2 col-xl-2"` is redundant and can be simplified to `class="col-lg-2"`'></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/cols-within-form-group.html b/test/fixtures/grid/cols-within-form-group.html
similarity index 100%
rename from test/_old_fixtures/grid/cols-within-form-group.html
rename to test/fixtures/grid/cols-within-form-group.html
diff --git a/test/_old_fixtures/grid/cols-within-row.html b/test/fixtures/grid/cols-within-row.html
similarity index 100%
rename from test/_old_fixtures/grid/cols-within-row.html
rename to test/fixtures/grid/cols-within-row.html
diff --git a/test/_old_fixtures/grid/non-col-row-children.html b/test/fixtures/grid/non-col-row-children.html
similarity index 90%
rename from test/_old_fixtures/grid/non-col-row-children.html
rename to test/fixtures/grid/non-col-row-children.html
index 4a3f40f4..292c5e7c 100644
--- a/test/_old_fixtures/grid/non-col-row-children.html
+++ b/test/fixtures/grid/non-col-row-children.html
@@ -25,7 +25,7 @@
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Only columns (`.col-*-*`) may be children of `.row`s"></li>
+            <li data-lint="Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s"></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/row-col-same-elem.html b/test/fixtures/grid/row-col-same-elem.html
similarity index 79%
rename from test/_old_fixtures/grid/row-col-same-elem.html
rename to test/fixtures/grid/row-col-same-elem.html
index e67a9b27..8bcd3694 100644
--- a/test/_old_fixtures/grid/row-col-same-elem.html
+++ b/test/fixtures/grid/row-col-same-elem.html
@@ -18,13 +18,13 @@
     </head>
     <body>
         <div class="container">
-            <div class="row col-xs-6"></div>
+            <div class="row col-6"></div>
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Found both `.row` and `.col-*-*` used on the same element"></li>
-            <li data-lint="Columns (`.col-*-*`) can only be children of `.row`s or `.form-group`s"></li>
+            <li data-lint="Found both `.row` and `.col*` used on the same element"></li>
+            <li data-lint="Columns (`.col*`) can only be children of `.row`s or `.form-row`s"></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/row-no-float.html b/test/fixtures/grid/row-no-float.html
similarity index 85%
rename from test/_old_fixtures/grid/row-no-float.html
rename to test/fixtures/grid/row-no-float.html
index bc1fc878..19d0debe 100644
--- a/test/_old_fixtures/grid/row-no-float.html
+++ b/test/fixtures/grid/row-no-float.html
@@ -18,11 +18,11 @@
     </head>
     <body>
         <div class="container">
-            <div class="row pull-right">
-                <div class="col-xs-6">Content</div>
+            <div class="row float-right">
+                <div class="col-md-6">Content</div>
             </div>
             
-            <div class="row pull-left">
+            <div class="row float-left">
                 <div class="col-md-6">Content</div>
             </div>
             
@@ -37,7 +37,7 @@
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="`.pull-right` and `.pull-left` must not be used on `.row` elements"></li>
+            <li data-lint="`.float-right` and `.float-left` must not be used on `.row` elements"></li>
             <li data-lint="Manually added `float` styles must not be added on `.row` elements"></li>
         </ol>
     </body>
diff --git a/test/_old_fixtures/grid/script-child-of-row.html b/test/fixtures/grid/script-child-of-row.html
similarity index 100%
rename from test/_old_fixtures/grid/script-child-of-row.html
rename to test/fixtures/grid/script-child-of-row.html
diff --git a/test/_old_fixtures/grid/spacer-col/blank-text.html b/test/fixtures/grid/spacer-col/blank-text.html
similarity index 78%
rename from test/_old_fixtures/grid/spacer-col/blank-text.html
rename to test/fixtures/grid/spacer-col/blank-text.html
index a04f981e..e2dc2e39 100644
--- a/test/_old_fixtures/grid/spacer-col/blank-text.html
+++ b/test/fixtures/grid/spacer-col/blank-text.html
@@ -19,16 +19,16 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="spacer col-xs-11">
+                <div class="spacer col-11">
                     
                 </div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid. So instead of having an empty grid column with `class=&quot;col-xs-11&quot;` , just add `class=&quot;col-xs-offset-11&quot;` to the next grid column."></li>
+            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid."></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/spacer-col/child-with-text.html b/test/fixtures/grid/spacer-col/child-with-text.html
similarity index 88%
rename from test/_old_fixtures/grid/spacer-col/child-with-text.html
rename to test/fixtures/grid/spacer-col/child-with-text.html
index f01cfedd..6a0e06e9 100644
--- a/test/_old_fixtures/grid/spacer-col/child-with-text.html
+++ b/test/fixtures/grid/spacer-col/child-with-text.html
@@ -19,8 +19,8 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="spacer col-xs-11"><p>Some text</p></div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="spacer col-11"><p>Some text</p></div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
diff --git a/test/_old_fixtures/grid/spacer-col/child-without-text.html b/test/fixtures/grid/spacer-col/child-without-text.html
similarity index 89%
rename from test/_old_fixtures/grid/spacer-col/child-without-text.html
rename to test/fixtures/grid/spacer-col/child-without-text.html
index 121fd368..72177659 100644
--- a/test/_old_fixtures/grid/spacer-col/child-without-text.html
+++ b/test/fixtures/grid/spacer-col/child-without-text.html
@@ -19,8 +19,8 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="spacer col-xs-11"><p></p></div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="spacer col-11"><p></p></div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
diff --git a/test/_old_fixtures/grid/spacer-col/col-element.html b/test/fixtures/grid/spacer-col/col-element.html
similarity index 85%
rename from test/_old_fixtures/grid/spacer-col/col-element.html
rename to test/fixtures/grid/spacer-col/col-element.html
index 731123b5..c490967e 100644
--- a/test/_old_fixtures/grid/spacer-col/col-element.html
+++ b/test/fixtures/grid/spacer-col/col-element.html
@@ -20,8 +20,8 @@
         <div class="container">
             <table>
                 <colgroup>
-                    <col class="col-xs-6">
-                    <col class="col-xs-6">
+                    <col class="col-6">
+                    <col class="col-6">
                 </colgroup>
                 <tbody>
                     <tr>
@@ -31,8 +31,8 @@
                 </tbody>
             </table>
             <div class="row">
-                <div class="spacer col-xs-11"><p>Some text</p></div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="spacer col-11"><p>Some text</p></div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
diff --git a/test/_old_fixtures/grid/spacer-col/last-child.html b/test/fixtures/grid/spacer-col/last-child.html
similarity index 89%
rename from test/_old_fixtures/grid/spacer-col/last-child.html
rename to test/fixtures/grid/spacer-col/last-child.html
index 38a461b2..69aaf9a0 100644
--- a/test/_old_fixtures/grid/spacer-col/last-child.html
+++ b/test/fixtures/grid/spacer-col/last-child.html
@@ -19,8 +19,8 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="col-xs-6">Some content</div>
-                <div class="spacer col-xs-6"></div>
+                <div class="col-6">Some content</div>
+                <div class="spacer col-6"></div>
             </div>
         </div>
 
diff --git a/test/_old_fixtures/grid/spacer-col/multiple-reversed-order.html b/test/fixtures/grid/spacer-col/multiple-reversed-order.html
similarity index 72%
rename from test/_old_fixtures/grid/spacer-col/multiple-reversed-order.html
rename to test/fixtures/grid/spacer-col/multiple-reversed-order.html
index b2ce673f..ebd9908c 100644
--- a/test/_old_fixtures/grid/spacer-col/multiple-reversed-order.html
+++ b/test/fixtures/grid/spacer-col/multiple-reversed-order.html
@@ -19,14 +19,14 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="spacer col-lg-5 col-sm-8 col-xs-11 col-md-6"></div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="spacer col-xl-3 col-lg-5 col-sm-8 col-11 col-md-6"></div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid. So instead of having an empty grid column with `class=&quot;col-xs-11 col-sm-8 col-md-6 col-lg-5&quot;` , just add `class=&quot;col-xs-offset-11 col-sm-offset-8 col-md-offset-6 col-lg-offset-5&quot;` to the next grid column."></li>
+            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid."></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/spacer-col/no-child-no-text.html b/test/fixtures/grid/spacer-col/no-child-no-text.html
similarity index 77%
rename from test/_old_fixtures/grid/spacer-col/no-child-no-text.html
rename to test/fixtures/grid/spacer-col/no-child-no-text.html
index 0003e064..66e9441c 100644
--- a/test/_old_fixtures/grid/spacer-col/no-child-no-text.html
+++ b/test/fixtures/grid/spacer-col/no-child-no-text.html
@@ -19,14 +19,14 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="spacer col-xs-11"></div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="spacer col-11"></div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid. So instead of having an empty grid column with `class=&quot;col-xs-11&quot;` , just add `class=&quot;col-xs-offset-11&quot;` to the next grid column."></li>
+            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid."></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/spacer-col/non-blank-text.html b/test/fixtures/grid/spacer-col/non-blank-text.html
similarity index 89%
rename from test/_old_fixtures/grid/spacer-col/non-blank-text.html
rename to test/fixtures/grid/spacer-col/non-blank-text.html
index c581140a..bc5d5214 100644
--- a/test/_old_fixtures/grid/spacer-col/non-blank-text.html
+++ b/test/fixtures/grid/spacer-col/non-blank-text.html
@@ -19,8 +19,8 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="spacer col-xs-11">Some text</div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="spacer col-11">Some text</div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
diff --git a/test/_old_fixtures/grid/spacer-col/tricky-classes.html b/test/fixtures/grid/spacer-col/tricky-classes.html
similarity index 74%
rename from test/_old_fixtures/grid/spacer-col/tricky-classes.html
rename to test/fixtures/grid/spacer-col/tricky-classes.html
index 71e86cac..b725d813 100644
--- a/test/_old_fixtures/grid/spacer-col/tricky-classes.html
+++ b/test/fixtures/grid/spacer-col/tricky-classes.html
@@ -19,14 +19,14 @@
     <body>
         <div class="container">
             <div class="row">
-                <div class="spacer col-xs col-xs- col-ab-5 col-xs-a col- col-xs-11 col-sm-offset-q"></div>
-                <div class="col-xs-1">Actual column</div>
+                <div class="spacer col- col-ab-5 col-a col-11 col-sm-offset-q"></div>
+                <div class="col-1">Actual column</div>
             </div>
         </div>
 
         <div id="qunit"></div>
         <ol id="bootlint">
-            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid. So instead of having an empty grid column with `class=&quot;col-xs-11&quot;` , just add `class=&quot;col-xs-offset-11&quot;` to the next grid column."></li>
+            <li data-lint="Using empty spacer columns isn't necessary with Bootstrap's grid."></li>
         </ol>
     </body>
 </html>
diff --git a/test/_old_fixtures/grid/spacer-col/void-elements.html b/test/fixtures/grid/spacer-col/void-elements.html
similarity index 71%
rename from test/_old_fixtures/grid/spacer-col/void-elements.html
rename to test/fixtures/grid/spacer-col/void-elements.html
index 5d038e48..642a05c8 100644
--- a/test/_old_fixtures/grid/spacer-col/void-elements.html
+++ b/test/fixtures/grid/spacer-col/void-elements.html
@@ -19,36 +19,36 @@
     <body>
         <div class="container">
             <div class="row">
-                <br class="col-xs-4">
-                <div class="col-xs-8">Actual column</div>
+                <br class="col-4">
+                <div class="col-8">Actual column</div>
             </div>
         </div>
 
         <div class="container">
             <div class="row">
-                <embed class="col-xs-4" src="#" type="video/mp4">
-                <div class="col-xs-8">Actual column</div>
+                <embed class="col-4" src="#" type="video/mp4">
+                <div class="col-8">Actual column</div>
             </div>
         </div>
 
         <div class="container">
             <div class="row">
-                <hr class="col-xs-4">
-                <div class="col-xs-8">Actual column</div>
+                <hr class="col-4">
+                <div class="col-8">Actual column</div>
             </div>
         </div>
 
         <div class="container">
             <div class="row">
-                <img class="col-xs-4" src="#" alt="An image">
-                <div class="col-xs-8">Actual column</div>
+                <img class="col-4" src="#" alt="An image">
+                <div class="col-8">Actual column</div>
             </div>
         </div>
 
         <div class="container">
             <div class="row">
-                <input class="col-xs-4" type="text">
-                <div class="col-xs-8">Actual column</div>
+                <input class="col-4" type="text">
+                <div class="col-8">Actual column</div>
             </div>
         </div>