diff --git a/.travis.yml b/.travis.yml
index da3fb099..0727182b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ node_js:
  - "5.1"
 before_script:
  - npm install grunt-cli -g
+ - "export DISPLAY=:99.0"
+ - "sh -e /etc/init.d/xvfb start"
+ - sleep 5
 script:
 - grunt
 - npm test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28ca9bb3..6c6e31e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add test e2e enviroment
 - Add `chai-as-promised` npm module to devDependencies
 - Basic set of tests for clock module
+- Run e2e test in Travis
 
 ### Fixed
 - Update .gitignore to not ignore default modules folder.
diff --git a/package.json b/package.json
index 4be053c6..d8c10032 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "start": "sh run-start.sh",
     "postinstall": "sh installers/postinstall/postinstall.sh",
-    "test": "./node_modules/mocha/bin/mocha tests/unit --recursive",
+    "test": "./node_modules/mocha/bin/mocha tests --recursive",
     "test:unit": "./node_modules/mocha/bin/mocha tests/unit --recursive",
     "test:e2e": "./node_modules/mocha/bin/mocha tests/e2e --recursive"
   },