diff --git a/mfhdf/test/tcomp.c b/mfhdf/test/tcomp.c
index d6ee55f2a..53c68db88 100644
--- a/mfhdf/test/tcomp.c
+++ b/mfhdf/test/tcomp.c
@@ -64,7 +64,7 @@ test_various_comps()
     int32     data[Y_LENGTH][X_LENGTH];
     int       num_errs = 0; /* number of errors in compression test so far */
 #ifdef H4_HAVE_SZIP_ENCODER
-    int32     pixels_per_scanline;
+    int32 pixels_per_scanline;
 #endif
 
     /* Buffer array data and define array dimensions. */
diff --git a/mfhdf/test/texternal.c b/mfhdf/test/texternal.c
index d918e55a4..49793cdea 100644
--- a/mfhdf/test/texternal.c
+++ b/mfhdf/test/texternal.c
@@ -477,8 +477,8 @@ test_mult_setexternal()
 
     /* Create data set SDS1 and write data to the external file; the returned
        value is the size of the data had been written for this sds */
-    size_written =
-        make_Ext3D_SDS(sd_id, temp_SDS1, DFNT_INT32, 3, dim_sizes, (void *)written_data, OFFSET, temp_EXTFILE2);
+    size_written = make_Ext3D_SDS(sd_id, temp_SDS1, DFNT_INT32, 3, dim_sizes, (void *)written_data, OFFSET,
+                                  temp_EXTFILE2);
     CHECK(size_written, FAIL, "make_Ext3D_SDS");
 
     /* Close the file to flush */
diff --git a/mfhdf/test/tfile.c b/mfhdf/test/tfile.c
index 583daf9c4..ee7b9dc32 100644
--- a/mfhdf/test/tfile.c
+++ b/mfhdf/test/tfile.c
@@ -177,8 +177,8 @@ test_file_inuse()
 static int
 test_max_open_files()
 {
-    int32 *fids = NULL;               /* holds IDs of opened files */
-    char  **filenames = NULL;         /* holds generated file names */
+    int32 *fids      = NULL;          /* holds IDs of opened files */
+    char **filenames = NULL;          /* holds generated file names */
     char   readfname[H4_MAX_NC_NAME]; /* file name retrieved from file id */
     int    index, status, curr_max,   /* curr maximum number of open files allowed in HDF */
         sys_limit,                    /* maximum number of open files allowed by system */