diff --git a/.gitattributes b/.gitattributes
index 647e48b..a7a1b25 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -65,12 +65,7 @@ src/h5/t_readwrite.c -text
 src/h5/u_readwrite.c -text
 src/h5/u_readwrite.h -text
 test/BlockTestSpecs.txt -text
-test/H5BlockDissolveGhosts.c -text
-test/H5BlockParTestScalarField.c -text
 test/H5BlockParTestScalarField.pbs -text
-test/H5BlockParTestScalarFieldF.f90 -text
-test/H5BlockTestAttributes.c -text
-test/H5BlockTestAttributesF.f90 -text
 test/H5ParallelTest.cc -text
 test/H5PartAndreasTest.cc -text
 test/H5PartTest.cc -text
@@ -79,6 +74,11 @@ test/H5test.cc -text
 test/H5testF.f -text
 test/H5testFpar.f90 -text
 test/Makefile.am -text
+test/h5b/H5BlockDissolveGhosts.c -text
+test/h5b/H5BlockParTestScalarField.c -text
+test/h5b/H5BlockParTestScalarFieldF.f90 -text
+test/h5b/H5BlockTestAttributes.c -text
+test/h5b/H5BlockTestAttributesF.f90 -text
 test/h5u/Bench.c -text
 tools/H5PartMerge/AUTHORS -text
 tools/H5PartMerge/COPYING -text
diff --git a/test/H5BlockDissolveGhosts.c b/test/h5b/H5BlockDissolveGhosts.c
similarity index 100%
rename from test/H5BlockDissolveGhosts.c
rename to test/h5b/H5BlockDissolveGhosts.c
diff --git a/test/H5BlockParTestScalarField.c b/test/h5b/H5BlockParTestScalarField.c
similarity index 100%
rename from test/H5BlockParTestScalarField.c
rename to test/h5b/H5BlockParTestScalarField.c
diff --git a/test/H5BlockParTestScalarFieldF.f90 b/test/h5b/H5BlockParTestScalarFieldF.f90
similarity index 100%
rename from test/H5BlockParTestScalarFieldF.f90
rename to test/h5b/H5BlockParTestScalarFieldF.f90
diff --git a/test/H5BlockTestAttributes.c b/test/h5b/H5BlockTestAttributes.c
similarity index 100%
rename from test/H5BlockTestAttributes.c
rename to test/h5b/H5BlockTestAttributes.c
diff --git a/test/H5BlockTestAttributesF.f90 b/test/h5b/H5BlockTestAttributesF.f90
similarity index 100%
rename from test/H5BlockTestAttributesF.f90
rename to test/h5b/H5BlockTestAttributesF.f90