diff --git a/tests/python/proton_tests/soak.py b/tests/python/proton_tests/soak.py
index e40fc2b..3a429fb 100644
--- a/tests/python/proton_tests/soak.py
+++ b/tests/python/proton_tests/soak.py
@@ -204,7 +204,7 @@ class MessengerSenderValgrind(MessengerSenderC):
             suppressions = os.path.join(os.path.dirname(__file__),
                                         "valgrind.supp" )
         self._command = ["valgrind", "--error-exitcode=1", "--quiet",
-                         "--trace-children=yes", "--leak-check=full",
+                         "--trace-children=yes", "--leak-check=full", "--gen-suppressions=yes",
                          "--suppressions=%s" % suppressions] + self._command

 class MessengerReceiverC(MessengerReceiver):
@@ -221,7 +221,7 @@ class MessengerReceiverValgrind(MessengerReceiverC):
             suppressions = os.path.join(os.path.dirname(__file__),
                                         "valgrind.supp" )
         self._command = ["valgrind", "--error-exitcode=1", "--quiet",
-                         "--trace-children=yes", "--leak-check=full",
+                         "--trace-children=yes", "--leak-check=full", "--gen-suppressions=yes",
                          "--suppressions=%s" % suppressions] + self._command

 class MessengerSenderPython(MessengerSender):
diff --git a/tests/python/proton_tests/valgrind.supp b/tests/python/proton_tests/valgrind.supp
index 1ff3b76..78e125a 100644
--- a/tests/python/proton_tests/valgrind.supp
+++ b/tests/python/proton_tests/valgrind.supp
@@ -1,13 +1,36 @@
 {
-   SSL ssl3_ctx_ctrl uses uninitialized data (expected) - 1
-   Memcheck:Value8
-   ...
+   SSL does a number of uninitialized accesses (expected) 1
+   Memcheck:Cond
+   fun:BN_bin2bn
+   obj:*
+   obj:*
    fun:ssl3_ctx_ctrl
 }

 {
-   SSL ssl3_ctx_ctrl uses uninitialized data (expected) - 2
+   SSL does a number of uninitialized accesses (expected) 2
    Memcheck:Cond
-   ...
+   fun:BN_num_bits_word
+   fun:BN_num_bits
+   fun:BN_mod_exp_mont_consttime
+   obj:*
+   fun:ssl3_ctx_ctrl
+}
+
+{
+   SSL does a number of uninitialized accesses (expected) 3
+   Memcheck:Value8
+   fun:BN_num_bits_word
+   fun:BN_num_bits
+   fun:BN_mod_exp_mont_consttime
+   obj:*
+   fun:ssl3_ctx_ctrl
+}
+
+{
+   SSL does a number of uninitialized accesses (expected) 4
+   Memcheck:Value8
+   fun:BN_mod_exp_mont_consttime
+   obj:*
    fun:ssl3_ctx_ctrl
 }