diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..b60c18b6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+    - "6.0"
\ No newline at end of file
diff --git a/package.json b/package.json
index 5c27e180..bf0af139 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "start": "webpack-dev-server --config webpack.dev.js",
-    "test": "NODE_ENV=test jest",
-    "test:watch": "npm test -- --watch",
+    "test": "NODE_ENV=test npm run lint && jest",
+    "test:watch": "NODE_ENV=test jest --watch",
     "build": "webpack --config webpack.config.js",
     "storybook": "start-storybook -p 9001",
     "storybook-build": "build-storybook -o dist",