diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6acf3be
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+dist: trusty
+sudo: false
+language: cpp
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-6
+
+script:
+  - mkdir tmp
+  - cd tmp
+  - cmake ..
+  - make
+  - ../build/MaddyTests
diff --git a/CMakeLists.txt b/CMakeLists.txt
index becb22a..d17319a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# This project is licensed under the MITlicense. For more information see the
+# This project is licensed under the MIT license. For more information see the
 # LICENSE file.
 
 cmake_minimum_required(VERSION 2.8)
diff --git a/tests/main.cpp b/tests/main.cpp
index a71f12e..d61102e 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -8,7 +8,7 @@
 // -----------------------------------------------------------------------------
 
 int main (int argc, char** argv) {
-  ::testing::GTEST_FLAG(throw_on_failure) = false;
+  ::testing::GTEST_FLAG(throw_on_failure) = true;
   ::testing::InitGoogleMock(&argc, argv);
   return RUN_ALL_TESTS();
 }