diff --git a/test/h5test.c b/test/h5test.c
index 6f27a93a36..5c2ed8013e 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -216,11 +216,8 @@ h5_delete_test_file(const char *base_name, hid_t fapl)
 void
 h5_delete_all_test_files(const char *base_name[], hid_t fapl)
 {
-    int i; /* iterator                             */
-
-    for (i = 0; base_name[i]; i++) {
+    for (int i = 0; base_name[i]; i++)
         h5_delete_test_file(base_name[i], fapl);
-    } /* end for */
 
 } /* end h5_delete_all_test_files() */
 
@@ -2201,13 +2198,13 @@ H5_get_srcdir(void)
 int
 h5_duplicate_file_by_bytes(const char *orig, const char *dest)
 {
-    FILE   *orig_ptr  = NULL;
-    FILE   *dest_ptr  = NULL;
-    hsize_t fsize     = 0;
-    hsize_t read_size = 0;
-    hsize_t max_buf   = 0;
-    void   *dup_buf   = NULL;
-    int     ret_value = 0;
+    FILE  *orig_ptr  = NULL;
+    FILE  *dest_ptr  = NULL;
+    size_t fsize     = 0;
+    size_t read_size = 0;
+    size_t max_buf   = 0;
+    void  *dup_buf   = NULL;
+    int    ret_value = 0;
 
     max_buf = 4096 * sizeof(char);
 
@@ -2218,7 +2215,7 @@ h5_duplicate_file_by_bytes(const char *orig, const char *dest)
     }
 
     HDfseek(orig_ptr, 0, SEEK_END);
-    fsize = (hsize_t)HDftell(orig_ptr);
+    fsize = (size_t)HDftell(orig_ptr);
     HDrewind(orig_ptr);
 
     dest_ptr = fopen(dest, "wb");