diff --git a/tests/suites.c b/tests/suites.c
index 4ffe25398..ebd2dae98 100644
--- a/tests/suites.c
+++ b/tests/suites.c
@@ -47,9 +47,11 @@
 static WOLFSSL_CTX* cipherSuiteCtx = NULL;
 static char nonblockFlag[] = "-N";
 static char noVerifyFlag[] = "-d";
-static char portFlag[] = "-p";
 static char flagSep[] = " ";
-static char svrPort[] = "0";
+#if !defined(USE_WINDOWS_API) && !defined(WOLFSSL_TIRTOS)
+    static char portFlag[] = "-p";
+    static char svrPort[] = "0";
+#endif
 
 
 #ifndef WOLFSSL_ALLOW_SSLV3
diff --git a/wolfssl/test.h b/wolfssl/test.h
index c859c4ab6..5be4aa171 100755
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -134,21 +134,19 @@
 /* Socket Handling */
 #ifndef WOLFSSL_SOCKET_INVALID
 #ifdef USE_WINDOWS_API
-    #define WOLFSSL_SOCKET_INVALID  INVALID_SOCKET
+    #define WOLFSSL_SOCKET_INVALID  ((SOCKET_T)INVALID_SOCKET)
 #elif defined(WOLFSSL_TIRTOS)
-    #define WOLFSSL_SOCKET_INVALID  -1
+    #define WOLFSSL_SOCKET_INVALID  ((SOCKET_T)-1)
 #else
-    #define WOLFSSL_SOCKET_INVALID  0
+    #define WOLFSSL_SOCKET_INVALID  (SOCKET_T)(0)
 #endif
 #endif /* WOLFSSL_SOCKET_INVALID */
 
 #ifndef WOLFSSL_SOCKET_IS_INVALID
-#ifdef USE_WINDOWS_API
-    #define WOLFSSL_SOCKET_IS_INVALID(s)  ((s) == WOLFSSL_SOCKET_INVALID)
-#elif defined(WOLFSSL_TIRTOS)
-    #define WOLFSSL_SOCKET_IS_INVALID(s)  ((s) == WOLFSSL_SOCKET_INVALID)
+#if defined(USE_WINDOWS_API) || defined(WOLFSSL_TIRTOS)
+    #define WOLFSSL_SOCKET_IS_INVALID(s)  ((SOCKET_T)(s) == WOLFSSL_SOCKET_INVALID)
 #else
-    #define WOLFSSL_SOCKET_IS_INVALID(s)  ((s) < WOLFSSL_SOCKET_INVALID)
+    #define WOLFSSL_SOCKET_IS_INVALID(s)  ((SOCKET_T)(s) < WOLFSSL_SOCKET_INVALID)
 #endif
 #endif /* WOLFSSL_SOCKET_IS_INVALID */