diff --git a/src/CTestConfig.cmake b/src/CTestConfig.cmake
index 410e57a3a..581cef11f 100644
--- a/src/CTestConfig.cmake
+++ b/src/CTestConfig.cmake
@@ -12,9 +12,7 @@ set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
 # Specify MEMCHECK Option: http://valgrind.org/docs/manual/mc-manual.html
 # Note: We use "--trace-children=yes" to valgrind-ise child processes (follow execve)
 # Note: We turn off "--show-reachable=yes" option.
-SET (VALGRIND_COMMAND_OPTIONS "-q --tool=memcheck --leak-check=yes
---workaround-gcc296-bugs=yes --num-callers=50 --trace-children=yes
---leak-check=full --track-origins=yes --gen-suppressions=all")
+SET (VALGRIND_COMMAND_OPTIONS "-q --tool=memcheck --leak-check=yes --workaround-gcc296-bugs=yes --num-callers=50 --trace-children=yes --leak-check=full --track-origins=yes")
 SET (MEMORYCHECK_SUPPRESSIONS_FILE "${CMAKE_SOURCE_DIR}/memcheck.supp")
 
 set(CTEST_DROP_METHOD "http")
diff --git a/src/memcheck.supp b/src/memcheck.supp
index bf053b9ee..25a25ec2a 100644
--- a/src/memcheck.supp
+++ b/src/memcheck.supp
@@ -11,7 +11,7 @@
    fun:*_thread_atexit
    fun:*
    fun:*
-   fun:*_Bind_simple*_invokeIIEEE*_Index_tuple*
+   fun:*_Bind_simple*_invoke*_Index_tuple*
    fun:*_Bind_simple*
    fun:*_Bind_simple*
    obj:*/libstdc++.so*