diff --git a/.travis.yml b/.travis.yml
index ea5bda1d..c4f68ae5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,7 @@ script:
   #
   # Valgrind
   #
-  - export CXXFLAGS=-O1
+  - export CXXFLAGS="-O1 -fno-inline"
   - if [ -x "$(command -v valgrind )" ]; then make clean && make -j2 ARCH=x86-64 debug=yes optimize=no build > /dev/null && ../tests/instrumented.sh --valgrind; fi
   - if [ -x "$(command -v valgrind )" ]; then ../tests/instrumented.sh --valgrind-thread; fi
   #
diff --git a/tests/instrumented.sh b/tests/instrumented.sh
index eb70466f..5156e02f 100755
--- a/tests/instrumented.sh
+++ b/tests/instrumented.sh
@@ -28,14 +28,14 @@ case $1 in
     echo "sanitizer-undefined testing started"
     prefix='!'
     exeprefix=''
-    postfix='2>&1 | grep "runtime error:"'
+    postfix='2>&1 | grep -A50 "runtime error:"'
     threads="1"
   ;;
   --sanitizer-thread)
     echo "sanitizer-thread testing started"
     prefix='!'
     exeprefix=''
-    postfix='2>&1 | grep "WARNING: ThreadSanitizer:"'
+    postfix='2>&1 | grep -A50 "WARNING: ThreadSanitizer:"'
     threads="2"
 
 cat << EOF > tsan.supp