diff --git a/memcheck/tests/clientstackperm.c b/memcheck/tests/clientstackperm.c
deleted file mode 100644
index 1e4e79dc2..000000000
--- a/memcheck/tests/clientstackperm.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "../memcheck.h"
-
-int baaaad ( void )
-{
-   int spacer0[10];
-   int aaa[10] __attribute__((unused));
-   int spacer1[10];
-   int bbb[10] __attribute__((unused));
-   int spacer2[10];
-   int ccc[10] __attribute__((unused));
-   int spacer3[10];
-   VALGRIND_MAKE_NOACCESS_STACK(spacer0, sizeof spacer0);
-   VALGRIND_MAKE_NOACCESS_STACK(spacer1, sizeof spacer1);
-   VALGRIND_MAKE_NOACCESS_STACK(spacer2, sizeof spacer2);
-   VALGRIND_MAKE_NOACCESS_STACK(spacer3, sizeof spacer3);
-   printf("reading memory\n");
-   if ((int*)0xDEADBEEF == &aaa[-3]) { printf("DEAD BEEF!\n"); }
-   return aaa[-3];
-}
-
-
-int main ( void )
-{
-   int z = baaaad();
-   return z;
-}
diff --git a/memcheck/tests/clientstackperm.stderr.exp b/memcheck/tests/clientstackperm.stderr.exp
deleted file mode 100644
index 9ca69f114..000000000
--- a/memcheck/tests/clientstackperm.stderr.exp
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Invalid read of size 4
-   at 0x........: baaaad (clientstackperm.c:23)
-   by 0x........: main (clientstackperm.c:29)
-   by 0x........: __libc_start_main (...libc...)
-   by 0x........: (within /.../tests/clientstackperm)
-   Address 0x........ is 36 bytes inside a 40-byte stack red-zone created
-   at 0x........: baaaad (clientstackperm.c:18)
-   by 0x........: main (clientstackperm.c:29)
-   by 0x........: __libc_start_main (...libc...)
-   by 0x........: (within /.../tests/clientstackperm)
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
diff --git a/memcheck/tests/clientstackperm.stderr.exp.hd b/memcheck/tests/clientstackperm.stderr.exp.hd
deleted file mode 100644
index 0f6ddc054..000000000
--- a/memcheck/tests/clientstackperm.stderr.exp.hd
+++ /dev/null
@@ -1,11 +0,0 @@
-
-discard 0 (0 -> 0) translations in range 0x........ .. 0x........
-discard 0 (0 -> 0) translations in range 0x........ .. 0x........
-discard 0 (0 -> 0) translations in range 0x........ .. 0x........
-discard 0 (0 -> 0) translations in range 0x........ .. 0x........
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v
diff --git a/memcheck/tests/clientstackperm.stdout.exp b/memcheck/tests/clientstackperm.stdout.exp
deleted file mode 100644
index df0c0ce6b..000000000
--- a/memcheck/tests/clientstackperm.stdout.exp
+++ /dev/null
@@ -1 +0,0 @@
-reading memory