diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 48a1652fdc3..bc0ef7ce53f 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -726,9 +726,9 @@ test_named()
         // It should be possible to define an attribute for the named type
         Attribute attr1 = itype.createAttribute("attr1", PredType::NATIVE_UCHAR, space);
         for (hsize_t i = 0; i < ds_size[0]; i++) {
-	        for (hsize_t j = 0; j < ds_size[1]; j++) {
-				attr_data[i][j] = (unsigned)i;
-			}
+            for (hsize_t j = 0; j < ds_size[1]; j++) {
+                attr_data[i][j] = (unsigned)i;
+            }
         }
         attr1.write(PredType::NATIVE_UINT, attr_data);
         attr1.close();
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index f61f5e63209..36f45ba53d4 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -669,7 +669,7 @@ test_generate(void)
             image_data[i] = 0;
         else {
             image_data[i] = (unsigned char)((255.0f * (data[i] - xmin)) / (xmax - xmin));
-		}
+        }
     }
 
     /* make the image */
diff --git a/src/H5detect.c b/src/H5detect.c
index a18d40322a1..983b24429f3 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -54,7 +54,7 @@ static const char *FileHeader = "\n\
  */
 H5_GCC_DIAG_OFF("cast-align")
 
-#if 0 //defined(__has_attribute)
+#if 0 // defined(__has_attribute)
 #if __has_attribute(no_sanitize_address)
 #define HDF_NO_UBSAN __attribute__((no_sanitize_address))
 #else
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index 2edf016744a..7cad36bfe8e 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -243,7 +243,7 @@ copy_named_datatype(hid_t type_in, hid_t fidout, named_dt_t **named_dt_head_p, t
             if (token_cmp == 0)
                 break; // found it!
         }
-        
+
         dt_ret = dt;
     }
     else {