diff --git a/.travis.yml b/.travis.yml
index 1416d60..afd1e21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,29 @@
+sudo: false
 language: node_js
-node_js:
-  - "0.10"
-  - "0.11"
\ No newline at end of file
+branches:
+  only:
+    - master
+matrix:
+  fast_finish: true
+  include:
+    # - os: linux
+    #   node_js: "7"
+    #   env: WEBPACK_VERSION="2.2.0" JOB_PART=lint
+    - os: linux
+      node_js: "6"
+      env: WEBPACK_VERSION="2.2.0" JOB_PART=test
+    - os: linux
+      node_js: "4.3"
+      env: WEBPACK_VERSION="2.2.0" JOB_PART=test
+    - os: linux
+      node_js: "7"
+      env: WEBPACK_VERSION="2.2.0" JOB_PART=test
+before_install:
+  - nvm --version
+  - node --version
+before_script:
+  - 'if [ "$WEBPACK_VERSION" ]; then npm install webpack@^$WEBPACK_VERSION; fi'
+script:
+  - npm run travis:$JOB_PART
+# after_success:
+#   - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/package.json b/package.json
index 76febed..c1b0b68 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   },
   "scripts": {
     "test": "mocha -R spec",
+    "travis:test": "npm run test",
     "release": "standard-version"
   },
   "repository": {