diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1c6dfc1a2..0a9f986f0 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -3,8 +3,9 @@
 ## - lots more mmap/munmap/mremap/mprotect ones
 ##---------------------------------------------------------------------------
 
-noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_stderr \
-                 filter_stderr_backtrace
+noinst_SCRIPTS = filter_allocs filter_leak_check_size filter_mismatches \
+		 filter_stderr filter_stderr_backtrace filter_pushfpopf \
+		 filter_tronical
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
 	badaddrvalue.stderr.exp \
diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index fbd7c3b50..65221fee9 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -1,4 +1,4 @@
-noinst_SCRIPTS = filter_stderr
+noinst_SCRIPTS = filter_cpuid  filter_none_discards filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
 	args.stderr.exp args.stdout.exp args.vgtest \
diff --git a/none/tests/cpuid.stdout.exp b/none/tests/cpuid.stdout.exp
index b38e16463..0034d0e8c 100644
--- a/none/tests/cpuid.stdout.exp
+++ b/none/tests/cpuid.stdout.exp
@@ -1,2 +1,2 @@
-cpuid words (0): 0x1 0x756e6547 0x6c65746e 0x49656e69
-cpuid words (1): 0x52b 0x0 0x0 0x8001bf
+cpuid words (0): 0x........ 0x........ 0x........ 0x........
+cpuid words (1): 0x........ 0x........ 0x........ 0x........
diff --git a/none/tests/cpuid.vgtest b/none/tests/cpuid.vgtest
index 36a2db0e6..6eeb2cb32 100644
--- a/none/tests/cpuid.vgtest
+++ b/none/tests/cpuid.vgtest
@@ -1 +1,2 @@
 prog: cpuid
+stdout_filter: filter_cpuid
diff --git a/none/tests/filter_cpuid b/none/tests/filter_cpuid
new file mode 100755
index 000000000..a7428708b
--- /dev/null
+++ b/none/tests/filter_cpuid
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+dir=`dirname $0`
+
+$dir/filter_stderr | $dir/../../tests/filter_addresses
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b2997a6a7..ada807be4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 SUBDIRS = . unused
 
 noinst_SCRIPTS = \
-	vg_regtest
+	vg_regtest \
 	filter_addresses \
 	filter_discards \
 	filter_stderr_basic \