diff --git a/lib/plato.js b/lib/plato.js
index 3aabab6f..648be3b4 100644
--- a/lib/plato.js
+++ b/lib/plato.js
@@ -86,7 +86,7 @@ exports.inspect = function(files, outputDir, options, done) {
           return path.join(file,innerFile);
         });
         runReports(files);
-      } else if (file.match(/\.js$/)) {
+      } else if (file.match(/\.(js|es|es6)$/)) {
         log.info('Reading "%s"', file);
 
         var fileShort = file.replace(commonBasePath, '');
diff --git a/test/fixtures/test.es b/test/fixtures/test.es
new file mode 100644
index 00000000..ae256fb5
--- /dev/null
+++ b/test/fixtures/test.es
@@ -0,0 +1,11 @@
+var a = 1;
+
+function fnA(arg) {
+  return arg;
+}
+
+function fnB(arg) {
+  return arg;
+}
+
+var b = fnB(1) + fnA(2);
diff --git a/test/plato_test.js b/test/plato_test.js
index c0cfaa0c..4c9d4dfb 100644
--- a/test/plato_test.js
+++ b/test/plato_test.js
@@ -115,7 +115,6 @@ exports['plato'] = {
       test.done();
      });
   },
-
   'should run jshint with default config' : function(test) {
 
     var files = [
@@ -130,5 +129,18 @@ exports['plato'] = {
       test.ok(overview.summary.total.jshint === 2, 'Should contain total jshint issues');
       test.done();
     });
+  },
+  'test file ending checks' : function(test) {
+    var files = [
+      'test/fixtures/test.es'
+    ];
+    
+    test.expect(1);
+    
+    plato.inspect(files, null, {}, function(reports) {
+      var overview = plato.getOverviewReport(reports);
+      test.ok(reports.length === 1, 'Should analyze 1 file');
+      test.done();
+    });
   }
 };