diff --git a/public/app/core/filters/filters.ts b/public/app/core/filters/filters.ts
index f6f0fd518fe..be9c3742866 100644
--- a/public/app/core/filters/filters.ts
+++ b/public/app/core/filters/filters.ts
@@ -15,7 +15,7 @@ module.filter('stringSort', function() {
 
 module.filter('slice', function() {
   return function(arr, start, end) {
-    if(!_.isUndefined(arr)) {
+    if (!_.isUndefined(arr)) {
       return arr.slice(start, end);
     }
   };
@@ -23,7 +23,7 @@ module.filter('slice', function() {
 
 module.filter('stringify', function() {
   return function(arr) {
-    if(_.isObject(arr) && !_.isArray(arr)) {
+    if (_.isObject(arr) && !_.isArray(arr)) {
       return angular.toJson(arr);
     } else {
       return _.isNull(arr) ? null : arr.toString();
@@ -32,8 +32,8 @@ module.filter('stringify', function() {
 });
 
 module.filter('moment', function() {
-  return function(date,mode) {
-    switch(mode) {
+  return function(date, mode) {
+    switch (mode) {
       case 'ago':
         return moment(date).fromNow();
     }
@@ -66,11 +66,12 @@ module.filter('interpolateTemplateVars', function(templateSrv) {
     } else {
       return templateSrv.replaceWithText(text, scope.row.scopedVars);
     }
-  }
+  };
 
   interpolateTemplateVars.$stateful = true;
 
   return interpolateTemplateVars;
 });
 
-export function filters() {}
+// dummy export
+export {};
diff --git a/public/test/karma.conf.js b/public/test/karma.conf.js
index 7c4881ee64a..6b51d1a5a1e 100644
--- a/public/test/karma.conf.js
+++ b/public/test/karma.conf.js
@@ -9,9 +9,6 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'public/test/test-main.js',
-      {pattern: 'public_gen/.app_gen/**/*.js', included: false},
-      {pattern: 'public_gen/vendor/**/*.js', included: false},
-      {pattern: 'public_gen/test/**/*.js', included: false},
       {pattern: 'public_gen/**/*.js', included: false}
     ],
 
@@ -28,4 +25,5 @@ module.exports = function(config) {
     singleRun: true,
 
   });
+
 };
diff --git a/tasks/default_task.js b/tasks/default_task.js
index 87a2f711faa..03f1b667941 100644
--- a/tasks/default_task.js
+++ b/tasks/default_task.js
@@ -6,6 +6,7 @@ module.exports = function(grunt) {
   grunt.registerTask('default', [
     'jscs',
     'jshint',
+    'tslint',
     'clean:gen',
     'copy:public_to_gen',
     'css',