diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..041cd68
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,9 @@
+{
+  "env": {
+    "node": true,
+    "es6": true
+  },
+  "parserOptions": {
+      "sourceType": "module"
+  }
+}
diff --git a/.travis.yml b/.travis.yml
index 87d4306..33b85ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
 - '4.1'
+scripe: npm run testTravis
 deploy:
   provider: heroku
   api_key:
diff --git a/package.json b/package.json
index d5d60ad..6690655 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,8 @@
   "main": "entrypoint.js",
   "scripts": {
     "test": "node test.js",
+    "lint": "eslint .",
+    "testTravis": "npm run lint && npm run test",
     "start": "DEBUG=express:* nodemon entrypoint.js"
   },
   "author": "Clay Allsopp <clay.allsopp@gmail.com>",
@@ -30,6 +32,7 @@
     "twit": "2.1.1"
   },
   "devDependencies": {
+    "eslint": "2.0.0-beta.2",
     "glob": "6.0.2",
     "nodemon": "1.8.1",
     "sane": "1.2.0",