diff --git a/.travis.yml b/.travis.yml
index 68a9b47d93b9d..a173842f9ad2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ compiler:
   - gcc
 env:
   global:
-    - PANIC_ACTION="gdb -silent -x raddb/panic.gdb %e %p 1>&2"
+    - PANIC_ACTION="gdb -batch -x raddb/panic.gdb %e %p 1>&2"
     - secure: "jiTi/FJ6jUToW5WswK1W5Xdb6kqZnduUlyeW24kfVsWpKqBakBX2bxG1Ko8XGLACaO+s7NjyrLypeoW0kuh9KBL/rvFMcU5gD1lzC+h0POwTHckaZZYkc0OmY0KIG4utPHXFJjwB9ga8wPJc5c+uBn/gREtlpjg9J1V87Rm39gM="
   matrix:
     - LIBS_OPTIONAL=no LIBS_SHARED=yes
@@ -14,22 +14,22 @@ addons:
     project:
       name: FreeRADIUS/freeradius-server
       version: master
-      description: The FreeRADIUS server project   
+      description: The FreeRADIUS server project
     notification_email: freeradius-devel@lists.freeradius.org
     build_command_prepend: ./configure
     build_command: make
     branch_pattern: coverity_*
 before_install:
   - sudo apt-get update -qq
-  - > 
-      sudo apt-get install --no-install-recommends -qq 
+  - >
+      sudo apt-get install --no-install-recommends -qq
       autoconf
       build-essential
       debhelper
       devscripts
       dh-make
       fakeroot
-      gdb 
+      gdb
       lintian
       pbuilder
       python-dev
diff --git a/src/tests/Makefile b/src/tests/Makefile
index aad0423c4f195..0fefcf4e395ab 100644
--- a/src/tests/Makefile
+++ b/src/tests/Makefile
@@ -57,7 +57,7 @@ test.conf: dictionary
 	@echo 'logdir = $${testdir}' >> test.conf
 	@echo 'radacctdir = $${testdir}' >> test.conf
 	@echo 'pidfile = $${testdir}/radiusd.pid' >> test.conf
-	@echo 'panic_action = "gdb -silent -x ${testdir}/panic.gdb %e %p > ${testdir}/gdb.log 2>&1; cat ${testdir}/gdb.log"' >> test.conf
+	@echo 'panic_action = "gdb -batch -x ${testdir}/panic.gdb %e %p > ${testdir}/gdb.log 2>&1; cat ${testdir}/gdb.log"' >> test.conf
 	@echo '$$INCLUDE radiusd.conf' >> test.conf
 	@echo '$$INCLUDE $${testdir}/config/' >> test.conf
 
diff --git a/src/tests/keywords/radiusd.conf b/src/tests/keywords/radiusd.conf
index b3c6afd9fe774..40c9f6da9c38d 100644
--- a/src/tests/keywords/radiusd.conf
+++ b/src/tests/keywords/radiusd.conf
@@ -4,7 +4,7 @@
 
 raddb		= raddb
 keyword		= src/tests/keywords
-panic_action	= "gdb -silent -x ${raddb}/panic.gdb %e %p > /tmp/frut_gdb.log 2>&1; cat /tmp/frut_gdb.log"
+panic_action	= "gdb -batch -x ${raddb}/panic.gdb %e %p > /tmp/frut_gdb.log 2>&1; cat /tmp/frut_gdb.log"
 modconfdir	= ${raddb}/mods-config
 
 modules {