diff --git a/wolfssl/test.h b/wolfssl/test.h
index a075643e6..3b7576c5f 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -250,7 +250,11 @@
 
 
 #ifdef SINGLE_THREADED
-    typedef unsigned int  THREAD_RETURN;
+    #if defined(WC_32BIT_CPU)
+        typedef void*   THREAD_RETURN;
+    #else
+        typedef unsigned int  THREAD_RETURN;
+    #endif
     typedef void*         THREAD_TYPE;
     #define WOLFSSL_THREAD
 #else
@@ -3055,7 +3059,7 @@ int StackSizeHWMReset(void)
 #define STACK_SIZE_CHECKPOINT(...) ({  \
     ssize_t HWM = StackSizeHWM_OffsetCorrected();    \
     __VA_ARGS__;                                     \
-    printf("    relative stack peak usage = %ld bytes\n", HWM);  \
+    printf("    relative stack peak usage = %d bytes\n", (int)HWM);  \
     StackSizeHWMReset();                             \
     })
 
@@ -3063,10 +3067,10 @@ int StackSizeHWMReset(void)
     ssize_t HWM = StackSizeHWM_OffsetCorrected();    \
     int _ret;                                        \
     __VA_ARGS__;                                     \
-    printf("    relative stack peak usage = %ld bytes\n", HWM);  \
+    printf("    relative stack peak usage = %d bytes\n", (int)HWM);  \
     _ret = StackSizeHWMReset();                      \
     if ((max >= 0) && (HWM > (ssize_t)(max))) {      \
-        printf("    relative stack usage at %s L%d exceeds designated max %ld bytes.\n", __FILE__, __LINE__, (ssize_t)(max)); \
+        printf("    relative stack usage at %s L%d exceeds designated max %d bytes.\n", __FILE__, __LINE__, (int)(max)); \
         _ret = -1;                                   \
     }                                                \
     _ret;                                            \