diff --git a/.editorconfig b/.editorconfig
index 6c76c202..61b85e21 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,8 @@
 # editorconfig.org
 root = true
 
-[*]
+# We need to specify each folder specifically to avoid including test/lib and test/data
+[{Gruntfile.js,src/**,test/*,test/demo/**,test/helpers/**,test/modules/**}]
 indent_style = space
 indent_size = 4
 end_of_line = lf
diff --git a/test/demo/memorycheck.html b/test/demo/memorycheck.html
index bebe80da..7a727fb5 100644
--- a/test/demo/memorycheck.html
+++ b/test/demo/memorycheck.html
@@ -23,19 +23,19 @@
     <script type="text/javascript">
 
         var _viewer;
-        
+
         var generateUniqueHash = (function() {
             var counter = 0;
             return function() {
                 return "openseadragon_" + (counter++);
             };
         })();
-        
+
         function createViewer() {
             if ( _viewer ) {
                 destroyViewer();
             }
-            
+
             _viewer = OpenSeadragon({
                 element: document.getElementById("contentDiv"),
                 showNavigationControl: false,
@@ -44,7 +44,7 @@
                 tileSources: "../data/testpattern.dzi"
             });
         }
-        
+
         function destroyViewer() {
             if ( _viewer ) {
                 _viewer.destroy();
diff --git a/test/modules/formats.js b/test/modules/formats.js
index b40c15c0..3c0f0610 100644
--- a/test/modules/formats.js
+++ b/test/modules/formats.js
@@ -108,6 +108,6 @@
     // ----------
     asyncTest('IIIF 2.0 JSON', function() {
         testOpen('iiif_2_0_tiled/info.json');
-    });    
+    });
 
 })();
diff --git a/test/modules/units.js b/test/modules/units.js
index 1ce10a09..b1d10d5c 100644
--- a/test/modules/units.js
+++ b/test/modules/units.js
@@ -107,7 +107,7 @@
                 var actualImageZoom = viewport.viewportToImageZoom(
                     expectedViewportZoom);
                 equal(actualImageZoom, expectedImageZoom);
-                
+
                 var actualViewportZoom = viewport.imageToViewportZoom(actualImageZoom);
                 equal(actualViewportZoom, expectedViewportZoom);
             }