diff --git a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
index 2e28d1265..64a402f87 100644
--- a/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
+++ b/IDE/XCODE-FIPSv2/macOS-C++/Intel/user_settings.h
@@ -650,12 +650,15 @@ extern "C" {
 //#define NO_SIG_WRAPPER
 
 /* wolfSSL engineering ACVP algo and operational testing only (Default: Off) */
-#if 0
+#if 0 /* Automation Grep Target */
     #undef WOLFSSL_PUBLIC_MP
     #define WOLFSSL_PUBLIC_MP
 
     #undef HAVE_FORCE_FIPS_FAILURE
     #define HAVE_FORCE_FIPS_FAILURE
+
+    /* operational test app depends on MD5 */
+    #undef NO_MD5
 #endif
 
 #ifdef __cplusplus
diff --git a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
index 21552aa1b..ef160e5ba 100644
--- a/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
+++ b/IDE/XCODE-FIPSv2/macOS-C++/M1/user_settings.h
@@ -53,7 +53,7 @@ extern "C" {
     #define TFM_TIMING_RESISTANT
 
     #undef TFM_NO_ASM
-    //#define TFM_NO_ASM
+    #define TFM_NO_ASM /* Necessary to exclude .i compilation */
 
     /* Optimizations */
     #define TFM_ARM
@@ -661,12 +661,15 @@ extern "C" {
 //#define NO_SIG_WRAPPER
 
 /* wolfSSL engineering ACVP algo and operational testing only (Default: Off) */
-#if 0
+#if 0 /* Automation Grep Target */
     #undef WOLFSSL_PUBLIC_MP
     #define WOLFSSL_PUBLIC_MP
 
     #undef HAVE_FORCE_FIPS_FAILURE
     #define HAVE_FORCE_FIPS_FAILURE
+
+    /* operational test app depends on MD5 */
+    #undef NO_MD5
 #endif
 
 #ifdef __cplusplus