diff --git a/test/wh_test_clientserver.c b/test/wh_test_clientserver.c
index 3c4a336f..a520bcf5 100644
--- a/test/wh_test_clientserver.c
+++ b/test/wh_test_clientserver.c
@@ -1236,7 +1236,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
     WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
     WH_TEST_ASSERT_RETURN(avail_objects == NF_OBJECT_COUNT);
 
-    H_TEST_RETURN_ON_FAIL(wh_Client_CommClose(client));
+    WH_TEST_RETURN_ON_FAIL(wh_Client_CommClose(client));
     WH_TEST_RETURN_ON_FAIL(wh_Client_Cleanup(client));
 
     return ret;
diff --git a/test/wh_test_crypto.c b/test/wh_test_crypto.c
index b8996675..194c9d09 100644
--- a/test/wh_test_crypto.c
+++ b/test/wh_test_crypto.c
@@ -260,7 +260,7 @@ int whTest_CryptoClientConfig(whClientConfig* config)
     wc_FreeRng(rng);
 
     /* Tell server to close */
-    H_TEST_RETURN_ON_FAIL(wh_Client_CommClose(client));
+    WH_TEST_RETURN_ON_FAIL(wh_Client_CommClose(client));
 
     if (ret == 0) {
         WH_TEST_RETURN_ON_FAIL(wh_Client_Cleanup(client));