diff --git a/.eslintrc.json b/.eslintrc.json
index 132eab9..bfccf67 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,7 +3,8 @@
     "json"
   ],
   "env": {
-    "browser": true
+    "browser": true,
+    "jquery": true
   },
   "extends": "eslint:recommended",
   "rules": {
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..76db03f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - "node"
+  - "6"
+  - "5"
+  - "4"
diff --git a/bin/check-event-json b/bin/check-event-json
index bc98b77..742214a 100755
--- a/bin/check-event-json
+++ b/bin/check-event-json
@@ -1,15 +1,23 @@
 #!/usr/bin/env node
 
-var fs = require("fs");
-var filename = process.argv[2];
+var fs = require('fs');
+var file = process.argv[2];
 
-if (filename) {
+if(file !== undefined && file !== null) {
+  checkJson(file);
+} else {
+  for(var i of ['events.json', '2015/events.json', '2016/events.json']) {
+    checkJson(i);
+  }
+  process.exit(0);
+}
+
+function checkJson (filename) {
   try {
-    JSON.parse(fs.readFileSync(filename, "utf8"));
-    console.log("Look good");
+    JSON.parse(fs.readFileSync(filename, 'utf8'));
+    console.log(filename +  ' look good');
   } catch (err) {
     console.error(err);
+    process.exit(1);
   }
-} else {
-  console.log("Usage: check-event-json events.json");
 }
diff --git a/js/main.js b/js/main.js
index abed777..c48fa2e 100644
--- a/js/main.js
+++ b/js/main.js
@@ -91,9 +91,9 @@ function loadEvents(days){
   var ce = $('.card-container__events');
   for(var i = 0; i < days.length; i++) {
     var day = days[i];
-    var ds = day.day+'-event';
-    var ul = day.day+'-events';
-    var de = $('<li><div id="'+day.day+'" class="collapsible-header container day"><h5 class="day__title" data-position="right"><span class="day__title__bold">' + day.day + '</span> - ' + day.description + '</h5></div><div class="collapsible-body"><ul id="'+ul+'"class="collapsible sub-collapsible" data-collepsible="accordion"></div></ul>').appendTo(ce);
+    var ul = day.day + '-events';
+    var de = $('<li><div id="' + day.day + '" class="collapsible-header container day"><h5 class="day__title" data-position="right"><span class="day__title__bold">' + day.day + '</span> - ' + day.description + '</h5></div><div class="collapsible-body"><ul id="'+ul+'"class="collapsible sub-collapsible" data-collepsible="accordion"></div></ul>');
+    de.appendTo(ce);
 
     for(var j = 0; j < day.events.length; j++) {
       var event = day.events[j];
diff --git a/package.json b/package.json
index cda0b3c..472df6d 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "This repository contains the Techweek website",
   "main": "gulpfile.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "eslint js/main,js && bin/check-event-json && gulp",
     "postinstall": "gulp"
   },
   "repository": {