diff --git a/.travis.yml b/.travis.yml
index eac688572..905ec3878 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,9 @@ node_js:
   - 5.5.0
 install:
   - npm install
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - sleep 3 # give xvfb some time to start
 script:
   - npm test
-  - webpack --bail --progress --build --tc
+  - npm run build
 sudo: false
 deploy:
   - provider: s3
diff --git a/package.json b/package.json
index 958acedee..6c30f39aa 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "topcoder-app",
   "description": "Topcoder pages including login, registration, settings, dashboard, profile.",
   "scripts": {
-    "build": "webpack --bail --progress --build",
+    "build": "webpack --bail --progress --build --tc",
     "dev": "webpack-dev-server --history-api-fallback --dev --tc --inline --progress --port 3000",
     "lint": "eslint .",
     "test": "karma start --tc --test"
diff --git a/webpack.config.js b/webpack.config.js
index 61600b876..ebc65ca46 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,9 +1,8 @@
 require('./node_modules/coffee-script/register')
 
-if (process.env.TRAVIS_BRANCH == 'master') process.env.ENV = 'PROD'
-else if (process.env.TRAVIS_BRANCH == 'qa-integration') process.env.ENV = 'QA'
-else if (process.env.TRAVIS_BRANCH == 'dev') process.env.ENV = 'DEV'
-else process.env.ENV = 'DEV'
+if (process.env.TRAVIS_BRANCH == 'master')         process.env.ENV = 'PROD'
+if (process.env.TRAVIS_BRANCH == 'qa-integration') process.env.ENV = 'QA'
+if (process.env.TRAVIS_BRANCH == 'dev')            process.env.ENV = 'DEV'
 
 var config = require('appirio-tech-webpack-config')({
   dirname: __dirname,