diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..72196724
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+sudo: false
+language: c++
+compiler:
+  - gcc
+  - clang
+
+    #addons:
+    #  apt:
+    #    sources:
+    #    packages:
+    #      - package-name-dev
+
+
+script:
+    - cd testing/
+    - make run_tests verbose=1
+    - ./run_tests
+
+
diff --git a/testing/run_tests.cpp b/testing/run_tests.cpp
index e083d534..318ef549 100644
--- a/testing/run_tests.cpp
+++ b/testing/run_tests.cpp
@@ -124,13 +124,14 @@ int main(int argc, char** argv)
 		}
 	}
 
+	// TODO output nothing except on failure?
 	if (!have_failure) {
 		puts("All tests passed");
 	}
 
 
 
-	return 0;
+	return have_failure;
 }
 
 int find_test(char* name)