diff --git a/scripts/include.am b/scripts/include.am
index 6882d24e1..7cf8df579 100644
--- a/scripts/include.am
+++ b/scripts/include.am
@@ -21,10 +21,6 @@ dist_noinst_SCRIPTS+= scripts/crl-revoked.test
 scripts/crl-revoked.log: scripts/resume.log
 endif
 
-if BUILD_OCSP
-dist_noinst_SCRIPTS+= scripts/ocsp.test
-endif
-
 if BUILD_OCSP_STAPLING
 dist_noinst_SCRIPTS+= scripts/ocsp-stapling.test
 scripts/ocsp-stapling.log: tests/unit.log
@@ -74,6 +70,11 @@ if !BUILD_IPV6
 dist_noinst_SCRIPTS+= scripts/external.test
 dist_noinst_SCRIPTS+= scripts/google.test
 dist_noinst_SCRIPTS+= scripts/openssl.test
+
+if BUILD_OCSP
+dist_noinst_SCRIPTS+= scripts/ocsp.test
+endif
+
 endif
 endif
 
diff --git a/wolfssl/test.h b/wolfssl/test.h
index a9cc4e868..a9af40315 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -793,7 +793,7 @@ static WC_INLINE void build_addr(SOCKADDR_IN_T* addr, const char* peer,
         addr->sin6_addr = in6addr_any;
     }
     else {
-        #ifdef HAVE_GETADDRINFO
+        #if defined(HAVE_GETADDRINFO) || defined(WOLF_C99)
             struct addrinfo  hints;
             struct addrinfo* answer = NULL;
             int    ret;