diff --git a/.travis.yml b/.travis.yml
index b37becb1..da3fb099 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ node_js:
  - "5.1"
 before_script:
  - npm install grunt-cli -g
-script: grunt
+script:
+- grunt
+- npm test
 cache:
  directories:
   - node_modules
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d845fec7..7d4563d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Scaled the splash screen down to make it a bit more subtle.
 - Replace HTML tables with markdown tables in README files.
 - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION` and `UPDATE_NOTIFICATION_MODULE` to Finnish translations.
+- Run `npm test` on Travis automatically
 
 ### Added
 - Add loaded function to modules, providing an async callback.