diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000000..ec9beafe71a5
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,35 @@
+language: cpp
+compiler:
+  - gcc
+before_script:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq libboost-all-dev libtolua-dev bc libcdb-dev libnet-dns-perl ldnsutils dnsutils
+script:
+ - ./bootstrap
+ - ./configure --with-modules='gmysql' --with-sqlite3
+ - make -j 4
+ - cd regression-tests
+ - touch verify-dnssec-zone/skip
+ - ./start-test-stop 5300 bind
+ - ./start-test-stop 5300 bind-presigned
+ - ./start-test-stop 5300 bind-dnssec
+ - ./start-test-stop 5300 bind-dnssec-presigned
+ - ./start-test-stop 5300 bind-dnssec-nsec3
+ - ./start-test-stop 5300 bind-dnssec-nsec3-presigned
+ - ./start-test-stop 5300 bind-dnssec-nsec3-optout
+ - ./start-test-stop 5300 bind-dnssec-nsec3-optout-presigned
+ - ./start-test-stop 5300 gmysql-nodnssec
+ - ./start-test-stop 5300 gmysql-nodnssec-presigned
+ - ./start-test-stop 5300 gmysql
+ - ./start-test-stop 5300 gmysql-presigned
+ - ./start-test-stop 5300 gmysql-nsec3
+ - ./start-test-stop 5300 gmysql-nsec3-presigned
+ - ./start-test-stop 5300 gmysql-nsec3-optout
+ - ./start-test-stop 5300 gmysql-nsec3-optout-presigned
+ - ./start-test-stop 5300 gmysql-nsec3-narrow
+notifications:
+  irc:
+    channels:
+      - "irc.oftc.net#powerdns-dev"
+    use_notice: true
+    skip_join: true
diff --git a/regression-tests/00dnssec-grabkeys/command b/regression-tests/00dnssec-grabkeys/command
index 8acf4a569e79..414b72d3f795 100755
--- a/regression-tests/00dnssec-grabkeys/command
+++ b/regression-tests/00dnssec-grabkeys/command
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 set pipefail
 rm -f trustedkeys
 rm -f unbound-host.conf
diff --git a/regression-tests/cleandig b/regression-tests/cleandig
index 91e8d996b404..9d0bd09d7868 100755
--- a/regression-tests/cleandig
+++ b/regression-tests/cleandig
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ ! -f ${testsdir}/${testname}/use.drill ]
+if [ ! -e ${testsdir}/${testname}/use.drill ]
 then
 ../pdns/sdig $nameserver $port $1 $2 $3 | LC_ALL=C sort
 fi
@@ -18,7 +18,7 @@ then
 	unbound-host -v -C unbound-host.conf -t $2 $1 > ${testsdir}/${testname}/unbound-host.out 2>&1
 	echo RETVAL: $? >> ${testsdir}/${testname}/unbound-host.out
 fi
-if [ -f ${testsdir}/${testname}/use.drill ]
+if [ -e ${testsdir}/${testname}/use.drill ]
 then
 	cat ${testsdir}/${testname}/drill.out
 fi
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 8d22ec9e183f..af74ec6113b1 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -593,3 +593,13 @@ then
 fi
 kill $(cat pdns*.pid)
 rm pdns*.pid
+
+if [ -s "./failed_tests" ]
+then
+	for t in `cat failed_tests`
+	do
+		echo $t
+		cat $t/diff
+	done
+	exit 1
+fi