diff --git a/src/ssl.c b/src/ssl.c
index 14f112311..41fe9bad8 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -16904,7 +16904,9 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
         return 0;
     }
 
-    #if defined(OPENSSL_EXTRA)
+    #if defined(OPENSSL_EXTRA) 
+    #if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+        (HAVE_FIPS_VERSION > 2))
     int wolfSSL_SHA_Transform(WOLFSSL_SHA_CTX* sha, 
                                          const unsigned char* data)
     {
@@ -16925,6 +16927,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
        return ret;
     }
     #endif
+    #endif
     
     int wolfSSL_SHA1_Init(WOLFSSL_SHA_CTX* sha)
     {
@@ -16947,6 +16950,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
         return SHA_Final(input, sha);
     }
     #if defined(OPENSSL_EXTRA)
+    #if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+        (HAVE_FIPS_VERSION > 2))
     int wolfSSL_SHA1_Transform(WOLFSSL_SHA_CTX* sha, 
                                          const unsigned char* data)
     {
@@ -16954,6 +16959,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
        return (wolfSSL_SHA_Transform(sha, data));
     }
     #endif
+    #endif
 #endif /* !NO_SHA */
 
 #ifdef WOLFSSL_SHA224
@@ -17058,6 +17064,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
     }
     
     #if defined(OPENSSL_EXTRA)
+    #if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+        (HAVE_FIPS_VERSION > 2))
     int wolfSSL_SHA256_Transform(WOLFSSL_SHA256_CTX* sha256, 
                                                 const unsigned char* data)
     {
@@ -17078,6 +17086,7 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
        return ret;
     }
     #endif
+    #endif
     
 #ifdef WOLFSSL_SHA384
 
@@ -17182,6 +17191,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
         return 0;
     }
 
+    #if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+        (HAVE_FIPS_VERSION > 2))
     int wolfSSL_SHA512_Transform(WOLFSSL_SHA512_CTX* sha512, 
                                           const unsigned char* data)
     {
@@ -17197,7 +17208,8 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
        
        return ret;
     }
-    
+    #endif /* !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+              (HAVE_FIPS_VERSION > 2)) */
 #endif /* WOLFSSL_SHA512 */
 
 #ifdef WOLFSSL_SHA3
diff --git a/tests/api.c b/tests/api.c
index 51fb3fac5..93f8f589b 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -32785,7 +32785,7 @@ static void test_wolfSSL_SHA(void)
 #if defined(OPENSSL_EXTRA) && !defined(HAVE_SELFTEST)
     printf(testingFmt, "wolfSSL_SHA()");
 
-    #if !defined(NO_SHA)
+    #if !defined(NO_SHA) && defined(NO_OLD_SHA_NAMES)
     {
         const unsigned char in[] = "abc";
         unsigned char expected[] = "\xA9\x99\x3E\x36\x47\x06\x81\x6A\xBA\x3E"
@@ -33119,6 +33119,8 @@ static void test_wolfSSL_SHA224(void)
 static void test_wolfSSL_SHA_Transform(void)
 {
 #if defined(OPENSSL_EXTRA) && !defined(NO_SHA)
+#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+        (HAVE_FIPS_VERSION > 2))
     byte input1[] = "";
     byte input2[] = "abc";
     byte local[WC_SHA_BLOCK_SIZE];
@@ -33157,11 +33159,14 @@ static void test_wolfSSL_SHA_Transform(void)
     
     printf(resultFmt, passed);
 #endif
+#endif
 }
 
 static void test_wolfSSL_SHA256_Transform(void)
 {
 #if defined(OPENSSL_EXTRA) && !defined(NO_SHA256)
+#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+        (HAVE_FIPS_VERSION > 2))
     byte input1[] = "";
     byte input2[] = "abc";
     byte local[WC_SHA256_BLOCK_SIZE];
@@ -33200,6 +33205,7 @@ static void test_wolfSSL_SHA256_Transform(void)
     
     printf(resultFmt, passed);
 #endif
+#endif
 }
 
 static void test_wolfSSL_SHA256(void)
@@ -33229,6 +33235,8 @@ static void test_wolfSSL_SHA256(void)
 static void test_wolfSSL_SHA512_Transform(void)
 {
 #if defined(OPENSSL_EXTRA) && defined(WOLFSSL_SHA512)
+#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS_VERSION) && \
+        (HAVE_FIPS_VERSION > 2))
     byte input1[] = "";
     byte input2[] = "abc";
     byte local[WC_SHA512_BLOCK_SIZE];
@@ -33272,6 +33280,7 @@ static void test_wolfSSL_SHA512_Transform(void)
     (void)input1;
     printf(resultFmt, passed);
 #endif
+#endif
 }
 
 static void test_wolfSSL_X509_get_serialNumber(void)
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index f01fcdd56..a3a527a97 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -2273,10 +2273,12 @@ extern void uITRON4_free(void *p) ;
 
 #if defined(NO_OLD_WC_NAMES) || defined(OPENSSL_EXTRA)
     /* added to have compatibility with SHA256() */
-    #if !defined(NO_OLD_SHA_NAMES) && !defined(HAVE_FIPS)
+    #if !defined(NO_OLD_SHA_NAMES) && (!defined(HAVE_FIPS) || \
+            (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
         #define NO_OLD_SHA_NAMES
     #endif
-    #if !defined(NO_OLD_MD5_NAME) && !defined(HAVE_FIPS)
+    #if !defined(NO_OLD_MD5_NAME) && (!defined(HAVE_FIPS) || \
+            (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
         #define NO_OLD_MD5_NAME
     #endif
 #endif