diff --git a/.travis.yml b/.travis.yml
index 3e50e18..12e1d56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,3 +62,6 @@ matrix:
 
 script:
   "./scripts/travis"
+
+after_failure:
+  "./scripts/travis_failure"
diff --git a/scripts/travis_failure b/scripts/travis_failure
new file mode 100755
index 0000000..93354fd
--- /dev/null
+++ b/scripts/travis_failure
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+CWD=`pwd`
+
+testsdir=`ls -d libressl-*/_build/sub/tests`
+if [ -d "$testsdir" ] ; then
+	echo "##### test logs in $testsdir"
+	cd $testsdir
+	for i in `ls *.trs` ; do
+		grep ':test-result: PASS' $i > /dev/null
+		if [ $? -eq 1 ] ; then
+			log=`echo $i | sed 's/\.trs$/\.log/'`
+			echo "***** $log"
+			cat $log
+		fi
+	done
+	cd $CWD
+fi
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 586f9d3..52acbba 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -173,6 +173,14 @@ add_executable(dsatest dsatest.c)
 target_link_libraries(dsatest ${OPENSSL_LIBS})
 add_test(dsatest dsatest)
 
+# dtlstest
+if(NOT WIN32)
+	add_executable(dtlstest dtlstest.c)
+	target_link_libraries(dtlstest ${OPENSSL_LIBS})
+	add_test(NAME dtlstest COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/dtlstest.sh)
+	set_tests_properties(dtlstest PROPERTIES ENVIRONMENT "srcdir=${TEST_SOURCE_DIR}")
+endif()
+
 if(NOT BUILD_SHARED_LIBS)
 # ec_point_conversion
 add_executable(ec_point_conversion ec_point_conversion.c)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9fac550..8ce338f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -171,6 +171,12 @@ TESTS += dsatest
 check_PROGRAMS += dsatest
 dsatest_SOURCES = dsatest.c
 
+# dtlstest
+TESTS += dtlstest.sh
+check_PROGRAMS += dtlstest
+dtlstest_SOURCES = dtlstest.c
+EXTRA_DIST += dtlstest.sh
+
 # ec_point_conversion
 TESTS += ec_point_conversion
 check_PROGRAMS += ec_point_conversion
diff --git a/tests/dtlstest.sh b/tests/dtlstest.sh
new file mode 100755
index 0000000..ef18cfc
--- /dev/null
+++ b/tests/dtlstest.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+dtlstest_bin=./dtlstest
+if [ -e ./dtlstest.exe ]; then
+	dtlstest_bin=./dtlstest.exe
+fi
+
+if [ -z $srcdir ]; then
+	srcdir=.
+fi
+
+$dtlstest_bin $srcdir/server.pem $srcdir/server.pem $srcdir/ca.pem