diff --git a/memcheck/tests/amd64/insn-pmovmskb.stderr.exp-clang b/memcheck/tests/amd64/insn-pmovmskb.stderr.exp-clang
index 6d32a1f33..e76c9ba12 100644
--- a/memcheck/tests/amd64/insn-pmovmskb.stderr.exp-clang
+++ b/memcheck/tests/amd64/insn-pmovmskb.stderr.exp-clang
@@ -1,22 +1,55 @@
+Use of uninitialised value of size 8
+   at 0x........: strlen (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:69)
+   by 0x........: main (insn-pmovmskb.c:140)
+
+Use of uninitialised value of size 8
+   at 0x........: strlen (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:69)
+   by 0x........: main (insn-pmovmskb.c:140)
+
 Conditional jump or move depends on uninitialised value(s)
+   at 0x........: is_overlap (vg_replace_strmem.c:...)
+   by 0x........: memcpy (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:69)
+   by 0x........: main (insn-pmovmskb.c:140)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: memcpy (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:69)
+   by 0x........: main (insn-pmovmskb.c:140)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: memcpy (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:69)
+   by 0x........: main (insn-pmovmskb.c:140)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: memcpy (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:69)
+   by 0x........: main (insn-pmovmskb.c:140)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: memcpy (vg_replace_strmem.c:...)
    ...
    by 0x........: use (insn-pmovmskb.c:48)
    by 0x........: doit (insn-pmovmskb.c:69)
    by 0x........: main (insn-pmovmskb.c:140)
 
 Use of uninitialised value of size 8
-   ...
-   by 0x........: use (insn-pmovmskb.c:48)
-   by 0x........: doit (insn-pmovmskb.c:69)
-   by 0x........: main (insn-pmovmskb.c:140)
-
-Use of uninitialised value of size 8
-   ...
-   by 0x........: use (insn-pmovmskb.c:48)
-   by 0x........: doit (insn-pmovmskb.c:69)
-   by 0x........: main (insn-pmovmskb.c:140)
-
-Use of uninitialised value of size 8
+   at 0x........: memcpy (vg_replace_strmem.c:...)
    ...
    by 0x........: use (insn-pmovmskb.c:48)
    by 0x........: doit (insn-pmovmskb.c:69)
@@ -32,6 +65,20 @@ Use of uninitialised value of size 8
 7: Invalid value is false
 8: Invalid value is false
 9: Invalid value is false
+Use of uninitialised value of size 8
+   at 0x........: memcpy (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:109)
+   by 0x........: main (insn-pmovmskb.c:140)
+
+Use of uninitialised value of size 8
+   at 0x........: memcpy (vg_replace_strmem.c:...)
+   ...
+   by 0x........: use (insn-pmovmskb.c:48)
+   by 0x........: doit (insn-pmovmskb.c:109)
+   by 0x........: main (insn-pmovmskb.c:140)
+
 10: Invalid value is false
 11: Invalid value is false
 12: Invalid value is false