diff --git a/CHANGES b/CHANGES
index e045d46415..032f4572e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-beta2-61 | 2018-11-01 19:57:32 -0500
+
+  * Add more debug output to Travis script (Jon Siwek, Corelight)
+
 2.6-beta2-60 | 2018-11-01 18:35:26 -0500
 
   * Add core file search and stack trace output for Travis builds (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index 7504a60de9..19086fb39d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-beta2-60
+2.6-beta2-61
diff --git a/testing/scripts/travis-job b/testing/scripts/travis-job
index 79c06c53c8..627f3be023 100644
--- a/testing/scripts/travis-job
+++ b/testing/scripts/travis-job
@@ -179,6 +179,7 @@ get_private_tests() {
 # Run Bro tests.
 run() {
     ulimit -c unlimited
+    ulimit -a
     echo
     echo "Running unit tests ##################################################"
     echo
@@ -220,19 +221,51 @@ run() {
     echo
     echo "Running external tests ##############################################"
     echo
-    make
 
-    if [ $? -ne 0 ]; then
-        showdiag
-        ret=1
+    set +e
+
+    if [ -d bro-testing ]; then
+      cd bro-testing
+      make
+
+      if [ $? -ne 0 ]; then
+          showdiag
+          ret=1
+      fi
+
+      cd ..
+    fi
+
+    if [ -d bro-testing-private]; then
+      cd bro-testing-private
+      make
+
+      if [ $? -ne 0 ]; then
+          showdiag
+          ret=1
+      fi
+
+      cd ..
     fi
 
     cd ../..
 
+    echo
+    echo "Result code after running tests: $ret"
+
     if [ $ret -ne 0 ]; then
-        COREFILE=`find testing/btest/.tmp testing/external/*/.tmp -name "core*" | head -n 1`
+        COREDUMP_FIND=`find testing/btest/.tmp testing/external/*/.tmp -name core*`
+        COREFILE=`find testing/btest/.tmp testing/external/*/.tmp -name core* | head -n 1`
+
+        echo
+        echo "Search for core dumps ##############################################"
+        echo
+        echo `pwd`
+        echo
+        echo $COREDUMP_FIND
 
         if [ -f "$COREFILE" ]; then
+            echo "Getting stack trace from $COREFILE"
             gdb build/src/bro -c "$COREFILE" -ex "thread apply all bt" -ex "set pagination 0" -batch;
         fi
     fi
@@ -243,7 +276,7 @@ run() {
 
 # Show failed tests (not skipped tests) from diag.log when a test fails.
 showdiag() {
-    f=bro-testing/diag.log
+    f=diag.log
 
     grep -qs '... failed$' $f && \
       echo && \