diff --git a/memcheck/tests/wrap3.c b/memcheck/tests/wrap3.c
index 1510d1311..c6c552d5d 100644
--- a/memcheck/tests/wrap3.c
+++ b/memcheck/tests/wrap3.c
@@ -5,17 +5,19 @@
 /* Check that function wrapping works for a mutually recursive
    pair. */
 
-static int fact1 ( int n );
-static int fact2 ( int n );
+int fact1 ( int n );
+int fact2 ( int n );
 
 /* This is needed to stop gcc4 turning 'fact' into a loop */
 __attribute__((noinline))
 int mul ( int x, int y ) { return x * y; }
 
+__attribute((noinline))
 int fact1 ( int n )
 {
    if (n == 0) return 1; else return mul(n, fact2(n-1));
 }
+__attribute((noinline))
 int fact2 ( int n )
 {
    if (n == 0) return 1; else return mul(n, fact1(n-1));
diff --git a/none/tests/faultstatus.c b/none/tests/faultstatus.c
index 1b583d9d4..458ea8264 100644
--- a/none/tests/faultstatus.c
+++ b/none/tests/faultstatus.c
@@ -190,7 +190,9 @@ int main()
 	return 0;
 }
 
+static volatile s_zero;
+
 static int zero()
 {
-	return 0;
+	return s_zero;
 }