diff --git a/hdf/test/tvnameclass.c b/hdf/test/tvnameclass.c
index ee39ced603..64ec6ad226 100644
--- a/hdf/test/tvnameclass.c
+++ b/hdf/test/tvnameclass.c
@@ -102,7 +102,7 @@ test_vglongnames(void)
     status = Vgetnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgname = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgname = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgname, "vgname", "test_vglongnames");
 
     status = Vgetname(vg1, vgname);
@@ -115,7 +115,7 @@ test_vglongnames(void)
     status = Vgetclassnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgclass = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgclass = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgclass, "vgclass", "test_vglongnames");
 
     status = Vgetclass(vg1, vgclass);
@@ -138,7 +138,7 @@ test_vglongnames(void)
     status = Vgetnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgname = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgname = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgname, "vgname", "test_vglongnames");
 
     status = Vgetname(vg1, vgname);
@@ -155,7 +155,7 @@ test_vglongnames(void)
     status = Vgetclassnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgclass = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgclass = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgclass, "vgclass", "test_vglongnames");
 
     status = Vgetclass(vg1, vgclass);
diff --git a/hdf/test/tvset.c b/hdf/test/tvset.c
index 15e6a34c49..05c5172855 100644
--- a/hdf/test/tvset.c
+++ b/hdf/test/tvset.c
@@ -595,7 +595,7 @@ read_vset_stuff(void)
     status = Vgetnamelen(vg1, &name_len);
     CHECK(status, FAIL, "Vgetnamelen:vg1");
 
-    vgname = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgname = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgname, "vgname", "read_vset_stuff");
 
     status = Vgetname(vg1, vgname);
@@ -604,7 +604,7 @@ read_vset_stuff(void)
     status = Vgetclassnamelen(vg1, &name_len);
     CHECK(status, FAIL, "Vgetclassnamelen:vg1");
 
-    vgclass = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgclass = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgclass, "vgclass", "read_vset_stuff");
 
     status = Vgetclass(vg1, vgclass);
@@ -1823,7 +1823,7 @@ test_vglongnames(void)
     status = Vgetnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgname = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgname = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgname, "vgname", "test_vglongnames");
 
     status = Vgetname(vg1, vgname);
@@ -1840,7 +1840,7 @@ test_vglongnames(void)
     status = Vgetclassnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgclass = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgclass = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgclass, "vgclass", "test_vglongnames");
 
     status = Vgetclass(vg1, vgclass);
@@ -1867,7 +1867,7 @@ test_vglongnames(void)
     status = Vgetnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgname = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgname = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgname, "vgname", "test_vglongnames");
 
     status = Vgetname(vg1, vgname);
@@ -1884,7 +1884,7 @@ test_vglongnames(void)
     status = Vgetclassnamelen(vg1, &name_len);
     CHECK_VOID(status, FAIL, "Vgetnamelen");
 
-    vgclass = (char *)malloc(sizeof(char *) * (name_len + 1));
+    vgclass = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(vgclass, "vgclass", "test_vglongnames");
 
     status = Vgetclass(vg1, vgclass);
@@ -2749,7 +2749,7 @@ test_extfile(void)
         name_len = VSgetexternalfile(vdata1_id, 0, NULL, NULL);
         VERIFY_VOID(name_len, (intn)strlen(EXTERNAL_FILE), "VSgetexternalfile");
 
-        extfile_name = (char *)malloc(sizeof(char *) * (name_len + 1));
+        extfile_name = (char *)malloc(sizeof(char) * (name_len + 1));
         CHECK_ALLOC(extfile_name, "extfile_name", "test_extfile");
 
         /* Old function: Get the external file name - VSgetexternalfile
@@ -2764,7 +2764,7 @@ test_extfile(void)
     name_len = VSgetexternalinfo(vdata1_id, 0, NULL, NULL, NULL);
     VERIFY_VOID(name_len, (intn)strlen(EXTERNAL_FILE), "VSgetexternalinfo");
 
-    extfile_name = (char *)malloc(sizeof(char *) * (name_len + 1));
+    extfile_name = (char *)malloc(sizeof(char) * (name_len + 1));
     CHECK_ALLOC(extfile_name, "extfile_name", "test_extfile");
 
     /* Get the external file name */
@@ -2777,12 +2777,12 @@ test_extfile(void)
        name should be truncated */
     {
         /* Make a shorter string to verify later */
-        char *short_name = (char *)malloc(sizeof(char *) * (name_len));
+        char *short_name = (char *)malloc(sizeof(char) * (name_len));
         memset(short_name, '\0', name_len);
         strncpy(short_name, EXTERNAL_FILE, name_len - 2);
 
         /* Prepare buffer for external file name in the following test */
-        extfile_name = (char *)malloc(sizeof(char *) * (name_len - 1));
+        extfile_name = (char *)malloc(sizeof(char) * (name_len - 1));
         memset(extfile_name, '\0', name_len);
 
         /* Call VSgetexternalinfo again with smaller buffer size and make sure