diff --git a/valgrind-pcmk.suppressions b/valgrind-pcmk.suppressions
index 1f4295ddc5..8d45537703 100644
--- a/valgrind-pcmk.suppressions
+++ b/valgrind-pcmk.suppressions
@@ -1,314 +1,296 @@
 # Valgrind suppressions for PE testing
 {
    Valgrind bug
    Memcheck:Addr8
    fun:__strspn_sse42
    fun:crm_get_msec
 }
 
 {
-   Ignore crm_system_name
-   Memcheck:Leak
-   fun:malloc
-   fun:crm_strdup_fn
-   fun:crm_log_init_worker
-   fun:crm_log_init
-   fun:main
-}
-
-{
-   libqb fixed upstream 1
+   Ignore option parsing
    Memcheck:Leak
    fun:realloc
-   fun:_grow_bin_array
-   fun:_qb_array_grow
-}
-
-{
-   libqb fixed upstream 2
-   Memcheck:Leak
-   fun:calloc
-   fun:qb_log_dcs_get
-   fun:_qb_log_callsite_get
+   fun:crm_get_option_long
+   fun:main
 }
 
 {
    Cman - Points to uninitialized bytes
    Memcheck:Param
    socketcall.sendmsg(msg)
    fun:__sendmsg_nocancel
    obj:*/libcman.so.3.0
    obj:*/libcman.so.3.0
 }
 
 {
    Cman - Jump or move depends on uninitialized values
    Memcheck:Cond
    obj:*/libcman.so.3.0
    obj:*/libcman.so.3.0
 }
 
 {
    quarks - hashtable
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libglib-*
    fun:g_slice_alloc
    fun:g_hash_table_new_full
    fun:g_quark_from_static_string
 }
 
 {
    quarks - hashtable 2
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_hash_table_new_full
    fun:g_quark_from_static_string
 }
 
 {
    quarks - hashtable 3
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_hash_table_new_full
    fun:g_quark_from_static_string
 }
 
 {
    quarks - hashtable 4
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    fun:g_quark_from_static_string
 }
 
 {
    g_mainloop - new
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_slist_*d
    fun:g_main_context_new
    fun:g_main_context_default
    fun:g_main_loop_new
    fun:main
 }
 
 {
    g_mainloop - new 2
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_main_loop_new
    fun:main
 }
 
 {
    g_mainloop - new 3
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_ptr_array_sized_new
    fun:g_main_context_new
    fun:g_main_context_default
    fun:g_main_loop_new
    fun:main
 }
 
 {
    g_mainloop - new 4
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_main_context_new
    fun:g_main_context_default
    fun:g_main_loop_new
    fun:main
 }
 
 {
    g_mainloop - new 5
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libglib-*
    fun:g_slice_alloc
    fun:g_ptr_array_sized_new
    fun:g_main_context_new
    fun:g_main_context_default
    fun:g_main_loop_new
    fun:main
 }
 
 {
    g_mainloop - run 1
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_slice_alloc0
    obj:*/libglib-*
    fun:g_main_context_dispatch
    obj:*/libglib-*
    fun:g_main_loop_run
 }
 
 {
    g_mainloop - run 2
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libglib-*
    fun:g_array_set_size
    fun:g_static_private_set
    obj:*/libglib-*
    fun:g_main_context_dispatch
    obj:*/libglib-*
    fun:g_main_loop_run
 }
 
 {
    g_mainloop - run 3
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    fun:g_slice_alloc
    fun:g_array_sized_new
    fun:g_static_private_set
    obj:*/libglib-*
    fun:g_main_context_dispatch
    obj:*/libglib-*
    fun:g_main_loop_run
 }
 
 {
    g_mainloop - run 4
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    fun:g_thread_self
    fun:g_main_loop_run
 }
 
 {
    g_mainloop - run 5
    Memcheck:Leak
    fun:malloc
    fun:g_malloc
    obj:*/libglib-*
    fun:g_main_loop_run
 }
 
 {
    g_mainloop - run 5
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libglib-*
    fun:g_ptr_array_add
    fun:g_main_context_check
    obj:*/libglib-*
    fun:g_main_loop_run
 }
 
 {
    glib types
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libgobject-*
    fun:g_type_register_static
 }
 
 {
    glib types 2
    Memcheck:Leak
    fun:realloc
    fun:g_realloc
    obj:*/libgobject-*
    fun:g_type_register_static
    fun:g_param_type_register_static
 }
 
 {
    glib types 3
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libgobject-*
    fun:g_type_register_fundamental
 }
 
 {
    glib types 4
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libgobject-*
    obj:*/libgobject-*
    fun:g_type_register_fundamental
 }
 
 {
    glib - the return
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libgobject-*
    obj:*/libgobject-*
    fun:_dl_init
 }
 
 {
    glib - seriously?
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libgobject-*
    obj:*/libgobject-*
    obj:*/libgobject-*
    fun:_dl_init
 }
 
 {
    glib - this isnt funny anymore
    Memcheck:Leak
    fun:malloc
    fun:realloc
    fun:g_realloc
    obj:*/libgobject-*
    fun:g_type_register_fundamental
 }
 
 {
    glib - why do you hate me?
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libgobject-*
    obj:*/libgobject-*
    fun:call_init.part.0
    fun:_dl_init
 }
 
 {
    dear glib - you suck at memory management
    Memcheck:Leak
    fun:calloc
    fun:g_malloc0
    obj:*/libgobject-*
    obj:*/libgobject-*
    obj:*/libgobject-*
    fun:call_init.part.0
    fun:_dl_init
 }
\ No newline at end of file