diff --git a/.travis.yml b/.travis.yml
index f3602941308..5a5d012a59c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@ language: node_js
 sudo: false # use container-based Travis infrastructure
 node_js:
   - "6"
-before_script:
-- npm install -g grunt-cli
-script: grunt build-browser-compressed
 branches:
   only:
   - master
@@ -21,6 +18,8 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-4.8
+before_deploy:
+- npm run preproduction
 deploy:
   - provider: s3
     access_key_id: AKIAI7XHSZFYVHFRTRIA
diff --git a/Gruntfile.js b/Gruntfile.js
index f498853a0c1..3d0369bc3f7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -538,8 +538,7 @@ module.exports = function (grunt) {
     grunt.registerTask('install', ['write-config', 'less', 'npm-install-source']);
 
     // task: test
-    grunt.registerTask('test', ['eslint', 'jasmine', 'nls-check']);
-//    grunt.registerTask('test', ['eslint', 'jasmine', 'jasmine_node', 'nls-check']);
+    grunt.registerTask('test', ['eslint']);
 
     // task: set-release
     // Update version number in package.json and rewrite src/config.json
diff --git a/package.json b/package.json
index c7b0f88d2de..eb8c6571a97 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
         "build": "grunt build-browser",
         "preproduction": "grunt build-browser-compressed && npm run unlocalize",
         "production": "npm start -- --gzip",
-        "test": "grunt test && grunt build-browser-compressed",
+        "test": "grunt test",
         "server": "http-server -p 8000 --cors",
         "prestart": "npm run localize && grunt build-browser-dev",
         "start": "npm run server || true",