diff --git a/tests/valgrind.supp b/tests/valgrind.supp
index b0e05c2c..25ff0cc1 100644
--- a/tests/valgrind.supp
+++ b/tests/valgrind.supp
@@ -1,30 +1,6 @@
-### CHECK
-{
-   check emalloc
-   Memcheck:Leak
-   fun:malloc
-   fun:emalloc
-}
-
-{
-   check setup_pipe
-   Memcheck:Leak
-   fun:malloc
-   fun:fdopen@@GLIBC_2.2.5
-   fun:tmpfile@@GLIBC_2.2.5
-   fun:setup_pipe
-}
-
-{
-   check erealloc
-   Memcheck:Leak
-   fun:realloc
-   fun:erealloc
-}
-
 ### GLIBC
 {
-   glibc regcomp
+   glibc_regcomp
    Memcheck:Leak
    fun:*alloc
    ...
@@ -33,17 +9,64 @@
 
 ### OPENSSL
 {
-   openssl lib64
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   obj:/lib64/libcrypto.so.*
+   openssl_crypto_value8
+   Memcheck:Value8
+   fun:*
+   obj:/lib*/libcrypto.so*
 }
 
 {
-   openssl lib
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   obj:/lib/libcrypto.so.*
+   openssl_crypto_value4
+   Memcheck:Value4
+   fun:*
+   obj:/lib*/libcrypto.so*
+}
+
+{
+   openssl_crypto_cond
+   Memcheck:Cond
+   fun:*
+   obj:/lib*/libcrypto.so*
+}
+
+{
+   openssl_BN_cond
+   Memcheck:Cond
+   fun:BN_*
+}
+
+{
+   openssl_AES_cond
+   Memcheck:Cond
+   fun:AES_*
+}
+
+{
+   openssl_DES_cond
+   Memcheck:Cond
+   fun:DES_*
+}
+
+{
+   openssl_DES_value8
+   Memcheck:Value8
+   fun:DES_*
+}
+
+{
+   openssl_DES_value4
+   Memcheck:Value4
+   fun:DES_*
+}
+
+{
+   openssl_BF_cond
+   Memcheck:Cond
+   fun:BF_*
+}
+
+{
+   openssl_SHA1_cond
+   Memcheck:Cond
+   fun:SHA1_*
 }