diff --git a/.travis.yml b/.travis.yml
index de9c5216c3c27cfb5a7d14b8a01c093d552964b0..e31ac7535142e1cfd2e9d154c0cdc26b50c00869 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,4 +25,4 @@ install:
   - source activate test-environment
   - pip install obspy
   - npm install
-script: grunt test
+script: grunt lint test
diff --git a/Gruntfile.js b/Gruntfile.js
index a336bb3c68ea0dfc2c464c7ff3117f304ebe4d01..ab4caea68c4b051a314cf2d49ae1436d97b0922e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,14 +6,18 @@ module.exports = function (grunt) {
   config.tasks.forEach(grunt.loadNpmTasks);
   grunt.initConfig(config);
 
+  grunt.registerTask('lint', [
+    'flake8',
+    'jshint'
+  ]);
+
   grunt.registerTask('test', [
     'nose:main'
   ]);
 
   grunt.registerTask('default', [
     'clean',
-    'flake8',
-    'jshint',
+    'lint',
     'test',
     'watch'
   ]);