diff --git a/.travis.yml b/.travis.yml
index ebc148d7f080f..4d5adf779d539 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,7 +77,7 @@ matrix:
         apt:
           packages:
             - valgrind
-    
+
 before_install: mkdir -p `dirname $GUAVA_JAR`
 install: if [ ! -f $GUAVA_JAR ]; then wget $GUAVA_URL -O $GUAVA_JAR; fi
 before_script: ./autogen.sh
@@ -93,4 +93,8 @@ script:
    make -j2 &&
    travis_wait 30 valgrind --error-exitcode=42 ./tests 16 &&
    travis_wait 30 valgrind --error-exitcode=42 ./exhaustive_tests;
-   fi 
+   fi
+
+after_script:
+    - cat ./tests.log
+    - cat ./exhaustive_tests.log
diff --git a/src/tests.c b/src/tests.c
index d408a5c30a48a..35fc8adb72700 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -5169,6 +5169,12 @@ void run_ecdsa_openssl(void) {
 int main(int argc, char **argv) {
     unsigned char seed16[16] = {0};
     unsigned char run32[32] = {0};
+
+    /* Disable buffering for stdout to improve reliability of getting
+     * diagnostic information. Happens right at the start of main because
+     * setbuf must be used before any other operation on the stream. */
+    setbuf(stdout, NULL);
+
     /* find iteration count */
     if (argc > 1) {
         count = strtol(argv[1], NULL, 0);