diff --git a/test/chunkstorage.jl b/test/chunkstorage.jl
index 30e361a89..7a41b640a 100644
--- a/test/chunkstorage.jl
+++ b/test/chunkstorage.jl
@@ -169,4 +169,4 @@ using Test
     end == reshape(1:24, 4, 6)
 
     rm(fn)
-end # testset "Raw Chunk I/O"
+end
diff --git a/test/extend_test.jl b/test/extend_test.jl
index 9a9eb89f5..6753e734e 100644
--- a/test/extend_test.jl
+++ b/test/extend_test.jl
@@ -75,4 +75,4 @@ using Test
 
     close(fid)
     rm(fn)
-end # testset extend_test
+end
diff --git a/test/external.jl b/test/external.jl
index d5327036f..63fbac9a7 100644
--- a/test/external.jl
+++ b/test/external.jl
@@ -55,4 +55,4 @@ using Test
     rm(fn1)
     # rm(fn2)
 
-end # testset external
+end
diff --git a/test/fileio.jl b/test/fileio.jl
index 7331eb311..4bf06862a 100644
--- a/test/fileio.jl
+++ b/test/fileio.jl
@@ -82,7 +82,7 @@ end
 
         @test all(keys(dat) .== ["b", "a", "G/z", "G/f"])
     end
-end # @testset track_order
+end
 
 @static if HDF5.API.h5_get_libversion() >= v"1.10.5"
     @testset "h5f_get_dset_no_attrs_hint" begin
@@ -105,4 +105,4 @@ end # @testset track_order
         end
         @test filesize(fn) > threshold + 1
     end
-end # @static if HDF5.API.h5_get_libversion() >= v"1.10.5"
+end
diff --git a/test/filter.jl b/test/filter.jl
index f7f90a732..6ea329557 100644
--- a/test/filter.jl
+++ b/test/filter.jl
@@ -222,4 +222,4 @@ using HDF5.Filters: ExternalFilter, isavailable, isencoderenabled, isdecoderenab
     @test isdecoderenabled(H5Z_FILTER_LZ4)
     @test isencoderenabled(Lz4Filter)
     @test isdecoderenabled(Lz4Filter)
-end # @testset "filter"
+end
diff --git a/test/gc.jl b/test/gc.jl
index 8ec38d1fc..82d69777d 100644
--- a/test/gc.jl
+++ b/test/gc.jl
@@ -73,4 +73,4 @@ end
     end
 
     rm(fn)
-end # testset gc
+end
diff --git a/test/mmap.jl b/test/mmap.jl
index 5c2af11b7..689bcd0b1 100644
--- a/test/mmap.jl
+++ b/test/mmap.jl
@@ -58,4 +58,4 @@ using Test
     close(f)
     # Restore complex support state
     complex_support && HDF5.enable_complex_support()
-end # testset
+end
diff --git a/test/mpio.jl b/test/mpio.jl
index 801f50853..6ee8ea985 100644
--- a/test/mpio.jl
+++ b/test/mpio.jl
@@ -87,4 +87,4 @@ using Test
     MPI.Barrier(MPI.COMM_WORLD)
 
     MPI.Finalize()
-end # testset mpio
+end
diff --git a/test/plain.jl b/test/plain.jl
index aaf0aa91b..6581610e3 100644
--- a/test/plain.jl
+++ b/test/plain.jl
@@ -471,7 +471,7 @@ end
             @test all(f["dataset"][:, :] .== 5)
         end
         rm(fn)
-    end # testset "Test h5d_fill
+    end
 
     @testset "h5d_gather" begin
         src_buf = rand(Int, (4, 4))
@@ -588,7 +588,7 @@ end
     @test open(crc32c, fn1) == open(crc32c, fn2)
     rm(fn1)
     rm(fn2)
-end # testset plain
+end
 
 @testset "complex" begin
     HDF5.enable_complex_support()
@@ -668,7 +668,7 @@ end
 
     close(f)
     rm(fn)
-end # testset null and undefined
+end
 
 # test writing abstract arrays
 @testset "abstract arrays" begin
@@ -704,7 +704,7 @@ end # testset null and undefined
     h5open(fn, "w"; alignment=(0, 8)) do fid
         fid["x"] = zeros(10, 10)
     end
-end # writing abstract arrays
+end
 
 # issue #705
 @testset "empty and 0-size arrays" begin
@@ -793,7 +793,7 @@ end # writing abstract arrays
     @test String(take!(buf)) == "HDF5.EmptyArray{Int64}()"
     show(buf, MIME"text/plain"(), HDF5.EmptyArray{Int64}())
     @test String(take!(buf)) == "HDF5.EmptyArray{Int64}()"
-end # empty and 0-size arrays
+end
 
 @testset "generic read of native types" begin
     fn = tempname()
@@ -862,7 +862,7 @@ end # empty and 0-size arrays
 
     close(hfile)
     rm(fn)
-end # generic read of native types
+end
 
 @testset "show" begin
     fn = tempname()
@@ -1190,7 +1190,7 @@ end # generic read of native types
     end
 
     rm(fn)
-end # show tests
+end
 
 @testset "split1" begin
     @test HDF5.split1("/") == ("/", "")
@@ -1263,7 +1263,7 @@ end # split1 tests
 
     close(hfile)
     rm(fn)
-end # haskey tests
+end
 
 @testset "AbstractString" begin
     fn = GenericString(tempname())
diff --git a/test/readremote.jl b/test/readremote.jl
index 3c4b0c501..15ef8d50a 100644
--- a/test/readremote.jl
+++ b/test/readremote.jl
@@ -197,4 +197,4 @@ using LinearAlgebra: norm
     A = read(fid, "DS1")
     @test A == AA
     close(fid)
-end # testset readremote
+end
diff --git a/test/swmr.jl b/test/swmr.jl
index 1b7b7046e..4f1727d55 100644
--- a/test/swmr.jl
+++ b/test/swmr.jl
@@ -120,4 +120,4 @@ end
     if nprocs() > 1
         rmprocs(procs)
     end
-end # testset swmr
+end