diff --git a/gm/valgrind.supp b/gm/valgrind.supp
index fbacf9b23c..ba886612d5 100644
--- a/gm/valgrind.supp
+++ b/gm/valgrind.supp
@@ -51,10 +51,10 @@
     ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
-{
-    driver_bug_4
-    Memcheck:Addr4
-    ...
+{
+    driver_bug_4
+    Memcheck:Addr4
+    ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
@@ -71,7 +71,19 @@
 }
 {
     driver_bug_7
-    Memcheck:Leak
-    fun:malloc
+    Memcheck:Leak
+    fun:malloc
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
+{
+    driver_bug_8
+    Memcheck:Overlap
+    fun:strcpy
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_9
+    Memcheck:Leak
+    fun:calloc
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
diff --git a/tests/valgrind.supp b/tests/valgrind.supp
index fbacf9b23c..ba886612d5 100644
--- a/tests/valgrind.supp
+++ b/tests/valgrind.supp
@@ -51,10 +51,10 @@
     ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
-{
-    driver_bug_4
-    Memcheck:Addr4
-    ...
+{
+    driver_bug_4
+    Memcheck:Addr4
+    ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
@@ -71,7 +71,19 @@
 }
 {
     driver_bug_7
-    Memcheck:Leak
-    fun:malloc
+    Memcheck:Leak
+    fun:malloc
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
+{
+    driver_bug_8
+    Memcheck:Overlap
+    fun:strcpy
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_9
+    Memcheck:Leak
+    fun:calloc
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
diff --git a/tools/valgrind.supp b/tools/valgrind.supp
index fbacf9b23c..ba886612d5 100644
--- a/tools/valgrind.supp
+++ b/tools/valgrind.supp
@@ -51,10 +51,10 @@
     ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
-{
-    driver_bug_4
-    Memcheck:Addr4
-    ...
+{
+    driver_bug_4
+    Memcheck:Addr4
+    ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
@@ -71,7 +71,19 @@
 }
 {
     driver_bug_7
-    Memcheck:Leak
-    fun:malloc
+    Memcheck:Leak
+    fun:malloc
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
+{
+    driver_bug_8
+    Memcheck:Overlap
+    fun:strcpy
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_9
+    Memcheck:Leak
+    fun:calloc
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}