diff --git a/memcheck/tests/wrap8.stderr.exp b/memcheck/tests/wrap8.stderr.exp
index fb9726693..e69de29bb 100644
--- a/memcheck/tests/wrap8.stderr.exp
+++ b/memcheck/tests/wrap8.stderr.exp
@@ -1,17 +0,0 @@
-Emulation fatal error -- Valgrind cannot continue:
-  PPC64 function redirection stack overflow
-   at 0x........: ???
-   by 0x........: fact2 (wrap8.c:79)
-   by 0x........: fact1 (wrap8.c:50)
-   by 0x........: fact1 (wrap8.c:66)
-   by 0x........: fact2 (wrap8.c:55)
-   by 0x........: fact2 (wrap8.c:80)
-   by 0x........: fact1 (wrap8.c:50)
-   by 0x........: fact1 (wrap8.c:66)
-   by 0x........: fact2 (wrap8.c:55)
-   by 0x........: fact2 (wrap8.c:80)
-   by 0x........: fact1 (wrap8.c:50)
-   by 0x........: fact1 (wrap8.c:66)
-
-Valgrind has to exit now.  Sorry.
-
diff --git a/memcheck/tests/wrap8.stderr.exp-ppc64 b/memcheck/tests/wrap8.stderr.exp-ppc64
new file mode 100644
index 000000000..c83bd474e
--- /dev/null
+++ b/memcheck/tests/wrap8.stderr.exp-ppc64
@@ -0,0 +1,15 @@
+Emulation fatal error -- Valgrind cannot continue:
+  PPC64 function redirection stack overflow
+   ...
+   by 0x........: pre (wrap8.c:116)
+   by 0x........: fact2 (wrap8.c:77)
+   by 0x........: fact1 (wrap8.c:49)
+   by 0x........: fact1 (wrap8.c:65)
+   by 0x........: fact2 (wrap8.c:54)
+   by 0x........: fact2 (wrap8.c:79)
+   by 0x........: fact1 (wrap8.c:49)
+   by 0x........: fact1 (wrap8.c:65)
+   by 0x........: fact2 (wrap8.c:54)
+
+Valgrind has to exit now.  Sorry.
+
diff --git a/memcheck/tests/wrap8.stderr.exp2 b/memcheck/tests/wrap8.stderr.exp2
deleted file mode 100644
index e69de29bb..000000000
diff --git a/memcheck/tests/wrap8.stdout.exp b/memcheck/tests/wrap8.stdout.exp
index e5c677b36..e0afd09c6 100644
--- a/memcheck/tests/wrap8.stdout.exp
+++ b/memcheck/tests/wrap8.stdout.exp
@@ -15,3 +15,63 @@ in wrapper1-pre:  fact(3)
 in wrapper2-pre:  fact(2)
 in wrapper1-pre:  fact(1)
 in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper1-post: fact(3) = 6
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
+in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(4) = 32
+in wrapper1-post: fact(5) = 160
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
+in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(6) = 972
+in wrapper1-post: fact(7) = 6804
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
+in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(8) = 54448
+in wrapper1-post: fact(9) = 490032
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
+in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(10) = 4900340
+in wrapper1-post: fact(11) = 53903740
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
+in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(12) = 646844904
+in wrapper1-post: fact(13) = -180950840
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
+in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+in wrapper2-post: fact(14) = 1761655564
+in wrapper1-post: fact(15) = 655029684
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
+in wrapper2-pre:  fact(0)
+in wrapper2-post: fact(0) = 1
+in wrapper1-post: fact(1) = 1
+in wrapper2-post: fact(2) = 2
+fact1(15) = 655029686
+allocated 111 Lards
diff --git a/memcheck/tests/wrap8.stdout.exp-ppc64 b/memcheck/tests/wrap8.stdout.exp-ppc64
new file mode 100644
index 000000000..eceed336f
--- /dev/null
+++ b/memcheck/tests/wrap8.stdout.exp-ppc64
@@ -0,0 +1,16 @@
+computing fact1(15)
+in wrapper1-pre:  fact(15)
+in wrapper2-pre:  fact(14)
+in wrapper1-pre:  fact(13)
+in wrapper2-pre:  fact(12)
+in wrapper1-pre:  fact(11)
+in wrapper2-pre:  fact(10)
+in wrapper1-pre:  fact(9)
+in wrapper2-pre:  fact(8)
+in wrapper1-pre:  fact(7)
+in wrapper2-pre:  fact(6)
+in wrapper1-pre:  fact(5)
+in wrapper2-pre:  fact(4)
+in wrapper1-pre:  fact(3)
+in wrapper2-pre:  fact(2)
+in wrapper1-pre:  fact(1)
diff --git a/memcheck/tests/wrap8.stdout.exp2 b/memcheck/tests/wrap8.stdout.exp2
deleted file mode 100644
index e0afd09c6..000000000
--- a/memcheck/tests/wrap8.stdout.exp2
+++ /dev/null
@@ -1,77 +0,0 @@
-computing fact1(15)
-in wrapper1-pre:  fact(15)
-in wrapper2-pre:  fact(14)
-in wrapper1-pre:  fact(13)
-in wrapper2-pre:  fact(12)
-in wrapper1-pre:  fact(11)
-in wrapper2-pre:  fact(10)
-in wrapper1-pre:  fact(9)
-in wrapper2-pre:  fact(8)
-in wrapper1-pre:  fact(7)
-in wrapper2-pre:  fact(6)
-in wrapper1-pre:  fact(5)
-in wrapper2-pre:  fact(4)
-in wrapper1-pre:  fact(3)
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper1-post: fact(3) = 6
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(4) = 32
-in wrapper1-post: fact(5) = 160
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(6) = 972
-in wrapper1-post: fact(7) = 6804
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(8) = 54448
-in wrapper1-post: fact(9) = 490032
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(10) = 4900340
-in wrapper1-post: fact(11) = 53903740
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(12) = 646844904
-in wrapper1-post: fact(13) = -180950840
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-in wrapper2-post: fact(14) = 1761655564
-in wrapper1-post: fact(15) = 655029684
-in wrapper2-pre:  fact(2)
-in wrapper1-pre:  fact(1)
-in wrapper2-pre:  fact(0)
-in wrapper2-post: fact(0) = 1
-in wrapper1-post: fact(1) = 1
-in wrapper2-post: fact(2) = 2
-fact1(15) = 655029686
-allocated 111 Lards