diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
index c93836e92..0a2ec17e2 100644
--- a/wolfcrypt/benchmark/benchmark.c
+++ b/wolfcrypt/benchmark/benchmark.c
@@ -110,7 +110,7 @@
     #undef  NO_FILESYSTEM
     #define NO_FILESYSTEM
 
-#elif defined(ANDROID)
+#elif defined(ANDROID) && !defined(ANDROID_v454)
     #ifdef XMALLOC_USER
         #include <stdlib.h>  /* we're using malloc / free direct here */
     #endif
diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c
index 515c33a35..5259673cc 100644
--- a/wolfcrypt/test/test.c
+++ b/wolfcrypt/test/test.c
@@ -172,10 +172,16 @@ _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
     #endif
     #include <android/log.h>
 
+    #ifndef ANDROID_v454 /* See fips/android/wolfCrypt_v454_android */
     #define printf(...)       \
                       __android_log_print(ANDROID_LOG_DEBUG, "TAG", __VA_ARGS__)
     #define fprintf(fp, ...)  \
                       __android_log_print(ANDROID_LOG_DEBUG, "TAG", __VA_ARGS__)
+    #else
+        #ifndef NO_FILESYSTEM
+            #define NO_FILESYSTEM /* Turn off tests that want to call SaveDerAndPem() */
+        #endif
+    #endif
 #elif defined(WOLFSSL_DEOS)
     #include <printx.h>
     #undef printf