diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index 567c2180852..b0f164bdd19 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -7834,7 +7834,7 @@ REGRESSION_TEST(SDK_API_UUID)(RegressionTest *test, int /* atype ATS_UNUSED */,
     if (TS_SUCCESS != TSUuidInitialize(uuid, TS_UUID_V4)) {
       SDK_RPRINT(test, "TSUuidInitialize", "TestCase1", TC_FAIL, "Failed to Initialize a V4 UUID");
       *pstatus = REGRESSION_TEST_FAILED;
-      return;
+      goto cleanup;
     } else {
       SDK_RPRINT(test, "TSUuidInitialize", "TestCase1", TC_PASS, "ok");
     }
@@ -7844,7 +7844,7 @@ REGRESSION_TEST(SDK_API_UUID)(RegressionTest *test, int /* atype ATS_UNUSED */,
   if (TS_UUID_V4 != TSUuidVersionGet(uuid)) {
     SDK_RPRINT(test, "TSUuidVersionGet", "TestCase1", TC_FAIL, "Failed to get the UUID version");
     *pstatus = REGRESSION_TEST_FAILED;
-    return;
+    goto cleanup;
   } else {
     SDK_RPRINT(test, "TSUuidVersionGet", "TestCase1", TC_PASS, "ok");
   }
@@ -7853,14 +7853,14 @@ REGRESSION_TEST(SDK_API_UUID)(RegressionTest *test, int /* atype ATS_UNUSED */,
   if (TS_SUCCESS != TSUuidCopy(uuid, machine)) {
     SDK_RPRINT(test, "TSUuidCopy", "TestCase1", TC_FAIL, "Failed to copy the Machine UUID object");
     *pstatus = REGRESSION_TEST_FAILED;
-    return;
+    goto cleanup;
   } else {
     SDK_RPRINT(test, "TSUuidCopy", "TestCase1", TC_PASS, "ok");
     str2 = TSUuidStringGet(uuid);
     if (!str2 || (TS_UUID_STRING_LEN != strlen(str2)) || strcmp(str1, str2)) {
       SDK_RPRINT(test, "TSUuidCopy", "TestCase2", TC_FAIL, "The copied UUID strings are not identical");
       *pstatus = REGRESSION_TEST_FAILED;
-      return;
+      goto cleanup;
     } else {
       SDK_RPRINT(test, "TSUuidCopy", "TestCase2", TC_PASS, "ok");
     }
@@ -7870,14 +7870,14 @@ REGRESSION_TEST(SDK_API_UUID)(RegressionTest *test, int /* atype ATS_UNUSED */,
   if (TS_SUCCESS != TSUuidInitialize(uuid, TS_UUID_V4)) {
     SDK_RPRINT(test, "TSUuidInitialize", "TestCase2", TC_FAIL, "Failed to re-initialize the UUID object");
     *pstatus = REGRESSION_TEST_FAILED;
-    return;
+    goto cleanup;
   } else {
     SDK_RPRINT(test, "TSUuidInitialize", "TestCase2", TC_PASS, "ok");
     str2 = TSUuidStringGet(uuid);
     if (!str2 || (TS_UUID_STRING_LEN != strlen(str2)) || !strcmp(str1, str2)) {
       SDK_RPRINT(test, "TSUuidInitialize", "TestCase3", TC_FAIL, "The re-initialized string is the same as before");
       *pstatus = REGRESSION_TEST_FAILED;
-      return;
+      goto cleanup;
     } else {
       SDK_RPRINT(test, "TSUuidInitialize", "TestCase3", TC_PASS, "ok");
     }
@@ -7887,14 +7887,14 @@ REGRESSION_TEST(SDK_API_UUID)(RegressionTest *test, int /* atype ATS_UNUSED */,
   if ((TS_SUCCESS != TSUuidStringParse(uuid, uuid_v1)) || (TS_UUID_V1 != TSUuidVersionGet(uuid))) {
     SDK_RPRINT(test, "TSUuidStringParse", "TestCase1", TC_FAIL, "Failed to parse the UUID v1 string");
     *pstatus = REGRESSION_TEST_FAILED;
-    return;
+    goto cleanup;
   } else {
     SDK_RPRINT(test, "TSUuidStringParse", "TestCase1", TC_PASS, "ok");
     str1 = TSUuidStringGet(uuid);
     if (!str1 || (TS_UUID_STRING_LEN != strlen(str1)) || strcmp(str1, uuid_v1)) {
       SDK_RPRINT(test, "TSUuidStringString", "TestCase2", TC_FAIL, "The parse UUID v1 string does not match the original");
       *pstatus = REGRESSION_TEST_FAILED;
-      return;
+      goto cleanup;
     } else {
       SDK_RPRINT(test, "TSUuidStringParse", "TestCase2", TC_PASS, "ok");
     }
@@ -7902,21 +7902,23 @@ REGRESSION_TEST(SDK_API_UUID)(RegressionTest *test, int /* atype ATS_UNUSED */,
   if ((TS_SUCCESS != TSUuidStringParse(uuid, uuid_v4)) || (TS_UUID_V4 != TSUuidVersionGet(uuid))) {
     SDK_RPRINT(test, "TSUuidStringParse", "TestCase3", TC_FAIL, "Failed to parse the UUID v4 string");
     *pstatus = REGRESSION_TEST_FAILED;
-    return;
+    goto cleanup;
   } else {
     SDK_RPRINT(test, "TSUuidStringParse", "TestCase3", TC_PASS, "ok");
     str1 = TSUuidStringGet(uuid);
     if (!str1 || (TS_UUID_STRING_LEN != strlen(str1)) || strcmp(str1, uuid_v4)) {
       SDK_RPRINT(test, "TSUuidStringParse", "TestCase4", TC_FAIL, "The parse UUID v4 string does not match the original");
       *pstatus = REGRESSION_TEST_FAILED;
-      return;
+      goto cleanup;
     } else {
       SDK_RPRINT(test, "TSUuidStringParse", "TestCase4", TC_PASS, "ok");
     }
   }
 
+  *pstatus = REGRESSION_TEST_PASSED;
+
+cleanup:
   TSUuidDestroy(uuid);
 
-  *pstatus = REGRESSION_TEST_PASSED;
   return;
 }