diff --git a/.travis.yml b/.travis.yml
index fa143f49c..b5d957044 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,29 +9,29 @@ python:
 sudo: true
 
 before_install:
-- sudo apt-get update
-- sudo apt-get install nodejs npm
+  - npm install
+  - sudo apt-get update
+  - sudo apt-get install nodejs npm
 
 install:
   - ./.travis_setup
 
 env:
-  - DJANGO="Django>=1.5,<1.6" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
-  - DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
-  - DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0"
-  - DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
-  - DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0"
-  - DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
-  - DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0"
-  - DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
-  - DJANGO="https://github.com/django/django/archive/master.zip" EASY_THUMBNAILS="easy-thumbnails>2.0"
-
-before_script:
-  - npm install
+  - TEST_SUITE=backend
+    - DJANGO="Django>=1.5,<1.6" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
+    - DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
+    - DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0"
+    - DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
+    - DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0"
+    - DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
+    - DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0"
+    - DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
+    - DJANGO="https://github.com/django/django/archive/master.zip" EASY_THUMBNAILS="easy-thumbnails>2.0"
+  - TEST_SUITE=frontend
 
 script:
-  - coverage run --rcfile=coverage.rc test_settings.py
-  - gulp ci
+  - coverage run --rcfile=coverage.rc test_settings.py:backend
+  - gulp ci:frontend
 
 after_success:
   - coveralls --config_file=coverage.rc
@@ -68,3 +68,4 @@ matrix:
       env: DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
     - python: 3.4
       env: DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
+    # fast_finish: true
diff --git a/gulpfile.js b/gulpfile.js
index 18e67c75b..6d6586d61 100755
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,6 +7,7 @@ var autoprefixer = require('gulp-autoprefixer');
 var sourcemaps = require('gulp-sourcemaps');
 var jshint = require('gulp-jshint');
 var jscs = require('gulp-jscs');
+var stylish = require('jshint-stylish');
 
 var PROJECT_ROOT = __dirname;
 var PROJECT_PATH = {
@@ -42,15 +43,15 @@ gulp.task('scss:watch', function () {
 // LINTING
 gulp.task('lint', function () {
     return gulp.src(PROJECT_PATTERNS.lint)
-        .pipe(jshint())
-        .pipe(jscs())
+        .pipe(jshint('.jshintrc'))
+        .pipe(jshint.reporter(stylish))
+        .pipe(jscs('.jscsrc'))
         .on('error', function (error) {
             gutil.log('\n' + error.message);
             if (process.env.CI) {
                 process.exit(1);
             }
-        })
-        .pipe(jshint.reporter('jshint-stylish'));
+        });
 });
 
 gulp.task('lint:watch', function () {
diff --git a/package.json b/package.json
index 4bf29095d..f0b9aa0eb 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "gulp-autoprefixer": "3.1.*",
     "gulp-jscs": "3.0.*",
     "gulp-jshint": "1.12.*",
+    "jshint-stylish": "2.0.*",
     "gulp-sass": "2.1.*",
     "gulp-sourcemaps": "1.6.*"
   }