diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index 0a5854303a4..61592165137 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -128,7 +128,7 @@ static hid_t create_stype1(void);
 static hid_t create_stype2(void);
 static hid_t create_stype3(void);
 static hid_t create_stype4(void);
-static int   compare_data(void *src_data, void *dst_data, hbool_t src_subset);
+static int   compare_data(void *src_data, void *dst_data, bool src_subset);
 static int   compare_stype4_data(void *expect_buf, void *rbuf);
 static int   compare_s1_data(void *expect_buf, void *rbuf);
 static int   compare_s1_s3_data(void *expect_buf, void *rbuf);
diff --git a/test/error_test.c b/test/error_test.c
index b0cd01b9aac..b08acf63fdb 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -700,7 +700,7 @@ test_pause(void)
     const char *err_msg1 = "Error message #1"; /* Error message #1 for pushing error */
     ssize_t     err_num;                       /* Number of errors on stack */
     hid_t       estack_id1 = H5I_INVALID_HID;  /* Error stack ID */
-    hbool_t     is_paused;                     /* Whether error stack is paused */
+    bool        is_paused;                     /* Whether error stack is paused */
     herr_t      ret;                           /* Generic return value */
 
     /* Push an error */
diff --git a/test/h5test.c b/test/h5test.c
index b5ea5ad6097..92e3c65c1d9 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -2394,10 +2394,10 @@ h5_check_file_locking_env_var(htri_t *use_locks, htri_t *ignore_disabled_locks)
 herr_t
 h5_using_native_vol(hid_t fapl_id, hid_t obj_id, bool *is_native_vol)
 {
-    hbool_t is_native = false;
-    hid_t   native_id = H5I_INVALID_HID;
-    hid_t   vol_id    = H5I_INVALID_HID;
-    herr_t  ret_value = SUCCEED;
+    bool   is_native = false;
+    hid_t  native_id = H5I_INVALID_HID;
+    hid_t  vol_id    = H5I_INVALID_HID;
+    herr_t ret_value = SUCCEED;
 
     assert((fapl_id >= 0) || (obj_id >= 0));
     assert(is_native_vol);
diff --git a/test/ttsafe_rec_rwlock.c b/test/ttsafe_rec_rwlock.c
index 8dd2dbaee00..5840cc38107 100644
--- a/test/ttsafe_rec_rwlock.c
+++ b/test/ttsafe_rec_rwlock.c
@@ -115,7 +115,7 @@ typedef struct rec_rwlock_test_udata_t {
 static H5TS_THREAD_RETURN_TYPE
 tts_rec_rwlock_smoke_check_test_thread(void *_udata)
 {
-    hbool_t                  read;
+    bool                     read;
     int32_t                  rec_lock_depth = 0;
     int32_t                  max_rec_lock_depth;
     int32_t                  rd_locks_remaining;
@@ -556,7 +556,7 @@ tts_rec_rwlock_smoke_check_2(const void H5_ATTR_UNUSED *params)
     H5TS_thread_t            threads[MAX_NUM_THREADS];
     rec_rwlock_test_udata_t *udata = NULL;
 #if H5TS_ENABLE_REC_RWLOCK_STATS
-    hbool_t                 verbose                     = false;
+    bool                    verbose                     = false;
     int32_t                 total_target_rd_lock_cycles = 0;
     int32_t                 total_target_wr_lock_cycles = 0;
     H5TS_rec_rwlock_stats_t stats;
@@ -762,7 +762,7 @@ tts_rec_rwlock_smoke_check_3(const void H5_ATTR_UNUSED *params)
     H5TS_thread_t            threads[MAX_NUM_THREADS];
     rec_rwlock_test_udata_t *udata = NULL;
 #if H5TS_ENABLE_REC_RWLOCK_STATS
-    hbool_t                 verbose                     = false;
+    bool                    verbose                     = false;
     int32_t                 total_target_rd_lock_cycles = 0;
     int32_t                 total_target_wr_lock_cycles = 0;
     H5TS_rec_rwlock_stats_t stats;
@@ -968,7 +968,7 @@ tts_rec_rwlock_smoke_check_4(const void H5_ATTR_UNUSED *params)
     H5TS_thread_t            threads[MAX_NUM_THREADS];
     rec_rwlock_test_udata_t *udata = NULL;
 #if H5TS_ENABLE_REC_RWLOCK_STATS
-    hbool_t                 verbose                     = false;
+    bool                    verbose                     = false;
     int32_t                 total_target_rd_lock_cycles = 0;
     int32_t                 total_target_wr_lock_cycles = 0;
     H5TS_rec_rwlock_stats_t stats;
diff --git a/test/vol.c b/test/vol.c
index 92b64c2532d..7d61f4f2daa 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -902,8 +902,8 @@ test_basic_file_operation(const char *driver_name)
      */
     h5_check_file_locking_env_var(&use_locking_env, &ignore_disabled_env);
     if (use_locking_env != FAIL) {
-        hbool_t default_use_locking           = true;
-        hbool_t default_ignore_disabled_locks = true;
+        bool default_use_locking           = true;
+        bool default_ignore_disabled_locks = true;
 
         if (H5Pget_file_locking(H5P_DEFAULT, &default_use_locking, &default_ignore_disabled_locks) < 0)
             TEST_ERROR;