diff --git a/C/H5D/test.sh.in b/C/H5D/test.sh.in
index 64ed41e7..f6e84273 100755
--- a/C/H5D/test.sh.in
+++ b/C/H5D/test.sh.in
@@ -111,11 +111,14 @@ version_compare "$H5_LIBVER" "1.8.23"
 if [ "$version_lt" = 1 ]; then
     USE_ALT="22"
 else
-# check if HDF5 version is < 1.10.8
-  version_compare "$H5_LIBVER" "1.10.8"
-  if [ "$version_lt" = 1 ]; then
-    USE_ALT="07"
-    nbitdir="110"
+# check if HDF5 version is >= 1.10.0 and < 1.10.8
+  version_compare "$H5_LIBVER" "1.10.0"
+  if [ "$version_lt" = 0 ]; then
+    version_compare "$H5_LIBVER" "1.10.8"
+    if [ "$version_lt" = 1 ]; then
+      USE_ALT="07"
+      nbitdir="110"
+    fi
   fi
 fi
 
diff --git a/C/H5T/test.sh.in b/C/H5T/test.sh.in
index 24bc3013..dc48ac99 100755
--- a/C/H5T/test.sh.in
+++ b/C/H5T/test.sh.in
@@ -130,7 +130,12 @@ do
         else
             version_compare "$H5_LIBVER" "1.12.0"
             if [ "$version_lt" = 1 ]; then
-                cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               version_compare "$H5_LIBVER" "1.10.7"
+               if [ "$version_lt" = 1 ]; then
+                  cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               else
+                  cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
+               fi
             else
                 cmp -s tmp.test $srcdir/tfiles/112/$fname.ddl
             fi
diff --git a/C/H5T/tfiles/18/112/h5ex_t_objref.ddl b/C/H5T/tfiles/18/112/h5ex_t_objref.ddl
deleted file mode 100644
index 03d74d83..00000000
--- a/C/H5T/tfiles/18/112/h5ex_t_objref.ddl
+++ /dev/null
@@ -1,22 +0,0 @@
-HDF5 "h5ex_t_objref.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
-      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-      DATA {
-         GROUP "h5ex_t_objref.h5/G1"
-         DATASET "h5ex_t_objref.h5/DS2"
-            DATA {
-            }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-   }
-   GROUP "G1" {
-   }
-}
-}
diff --git a/C/H5T/tfiles/18/112/h5ex_t_objrefatt.ddl b/C/H5T/tfiles/18/112/h5ex_t_objrefatt.ddl
deleted file mode 100644
index dd9db180..00000000
--- a/C/H5T/tfiles/18/112/h5ex_t_objrefatt.ddl
+++ /dev/null
@@ -1,28 +0,0 @@
-HDF5 "h5ex_t_objrefatt.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-      ATTRIBUTE "A1" {
-         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
-         DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-         DATA {
-            GROUP "h5ex_t_objrefatt.h5/G1"
-            DATASET "h5ex_t_objrefatt.h5/DS2"
-               DATA {
-               }
-         }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-   }
-   GROUP "G1" {
-   }
-}
-}
diff --git a/C/H5T/tfiles/18/112/h5ex_t_regref.ddl b/C/H5T/tfiles/18/112/h5ex_t_regref.ddl
deleted file mode 100644
index 14e1887e..00000000
--- a/C/H5T/tfiles/18/112/h5ex_t_regref.ddl
+++ /dev/null
@@ -1,33 +0,0 @@
-HDF5 "h5ex_t_regref.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
-      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-      DATA {
-         DATASET "h5ex_t_regref.h5/DS2"{
-            REGION_TYPE POINT  (0,1), (2,11), (1,0), (2,4)
-            DATATYPE  H5T_STD_I8LE
-            DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-         }
-         DATASET "h5ex_t_regref.h5/DS2"  {
-            REGION_TYPE BLOCK  (0,0)-(0,2), (0,11)-(0,13), (2,0)-(2,2),
-             (2,11)-(2,13)
-            DATATYPE  H5T_STD_I8LE
-            DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-         }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I8LE
-      DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-      DATA {
-      (0,0): 84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119,
-      (0,14): 110, 0,
-      (1,0): 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101,
-      (1,13): 114, 32, 0,
-      (2,0): 116, 104, 101, 32, 53, 32, 108, 97, 122, 121, 32, 100, 111, 103,
-      (2,14): 115, 0
-      }
-   }
-}
-}
diff --git a/C/H5T/tfiles/18/112/h5ex_t_regrefatt.ddl b/C/H5T/tfiles/18/112/h5ex_t_regrefatt.ddl
deleted file mode 100644
index 1bf51b02..00000000
--- a/C/H5T/tfiles/18/112/h5ex_t_regrefatt.ddl
+++ /dev/null
@@ -1,39 +0,0 @@
-HDF5 "h5ex_t_regrefatt.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-      ATTRIBUTE "A1" {
-         DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
-         DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-         DATA {
-            DATASET "h5ex_t_regrefatt.h5/DS2"{
-               REGION_TYPE POINT  (0,1), (2,11), (1,0), (2,4)
-               DATATYPE  H5T_STD_I8LE
-               DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-            }
-            DATASET "h5ex_t_regrefatt.h5/DS2"  {
-               REGION_TYPE BLOCK  (0,0)-(0,2), (0,11)-(0,13), (2,0)-(2,2),
-                (2,11)-(2,13)
-               DATATYPE  H5T_STD_I8LE
-               DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-            }
-         }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I8LE
-      DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-      DATA {
-      (0,0): 84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119,
-      (0,14): 110, 0,
-      (1,0): 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101,
-      (1,13): 114, 32, 0,
-      (2,0): 116, 104, 101, 32, 53, 32, 108, 97, 122, 121, 32, 100, 111, 103,
-      (2,14): 115, 0
-      }
-   }
-}
-}
diff --git a/FORTRAN/H5D/test.sh.in b/FORTRAN/H5D/test.sh.in
index 5a79e86b..76dbbcde 100755
--- a/FORTRAN/H5D/test.sh.in
+++ b/FORTRAN/H5D/test.sh.in
@@ -126,6 +126,7 @@ do
                 echo "  FAILED!"
              else
                 echo "  *Inconsequential difference* ... Passed"
+                status=0
              fi
           else
               echo "  Passed"
diff --git a/FORTRAN/H5T/CMakeLists.txt b/FORTRAN/H5T/CMakeLists.txt
index 7c16e383..67a3ca3d 100644
--- a/FORTRAN/H5T/CMakeLists.txt
+++ b/FORTRAN/H5T/CMakeLists.txt
@@ -177,7 +177,7 @@ if (HDF5_BUILD_TOOLS)
                     TARGET     ${EXAMPLE_VARNAME}_f90_${example_name}
                     POST_BUILD
                     COMMAND    ${CMAKE_COMMAND}
-                    ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/18/112/${example_name}.ddl ${example_name}.ddl
+                    ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/112/${example_name}.ddl ${example_name}.ddl
                 )
             else ()
               add_custom_command (
diff --git a/FORTRAN/H5T/test.sh.in b/FORTRAN/H5T/test.sh.in
index e25f4089..368b75aa 100755
--- a/FORTRAN/H5T/test.sh.in
+++ b/FORTRAN/H5T/test.sh.in
@@ -140,7 +140,12 @@ do
         else
             version_compare "$H5_LIBVER" "1.12.0"
             if [ "$version_lt" = 1 ]; then
-                cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               version_compare "$H5_LIBVER" "1.10.7"
+               if [ "$version_lt" = 1 ]; then
+                  cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               else
+                  cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
+               fi
             else
                 cmp -s tmp.test $srcdir/tfiles/112/$fname.ddl
             fi
@@ -156,7 +161,11 @@ do
     return_val=`expr $status + $return_val`
 done
 
-topics=" vlenatt_F03 vlen_F03"
+topics=""
+version_compare "$H5_LIBVER" "1.10.0"
+if [ "$version_lt" = 0 ]; then
+  topics=" vlenatt_F03 vlen_F03"
+fi
 
 for topic in $topics
 do
diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_objref_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_objref_F03.ddl
deleted file mode 100644
index 6d916872..00000000
--- a/FORTRAN/H5T/tfiles/18/112/h5ex_t_objref_F03.ddl
+++ /dev/null
@@ -1,22 +0,0 @@
-HDF5 "h5ex_t_objref_F03.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
-      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-      DATA {
-         GROUP "h5ex_t_objref_F03.h5/G1"
-         DATASET "h5ex_t_objref_F03.h5/DS2"
-            DATA {
-            }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-   }
-   GROUP "G1" {
-   }
-}
-}
diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_objrefatt_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_objrefatt_F03.ddl
deleted file mode 100644
index 05796208..00000000
--- a/FORTRAN/H5T/tfiles/18/112/h5ex_t_objrefatt_F03.ddl
+++ /dev/null
@@ -1,28 +0,0 @@
-HDF5 "h5ex_t_objrefatt_F03.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-      ATTRIBUTE "A1" {
-         DATATYPE  H5T_REFERENCE { H5T_STD_REF_OBJECT }
-         DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-         DATA {
-            GROUP "h5ex_t_objrefatt_F03.h5/G1"
-            DATASET "h5ex_t_objrefatt_F03.h5/DS2"
-               DATA {
-               }
-         }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-   }
-   GROUP "G1" {
-   }
-}
-}
diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_regref_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_regref_F03.ddl
deleted file mode 100644
index cd7c1ac6..00000000
--- a/FORTRAN/H5T/tfiles/18/112/h5ex_t_regref_F03.ddl
+++ /dev/null
@@ -1,33 +0,0 @@
-HDF5 "h5ex_t_regref_F03.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
-      DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-      DATA {
-         DATASET "h5ex_t_regref_F03.h5/DS2"{
-            REGION_TYPE POINT  (0,1), (2,11), (1,0), (2,4)
-            DATATYPE  H5T_STD_I8LE
-            DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-         }
-         DATASET "h5ex_t_regref_F03.h5/DS2"  {
-            REGION_TYPE BLOCK  (0,0)-(0,2), (0,11)-(0,13), (2,0)-(2,2),
-             (2,11)-(2,13)
-            DATATYPE  H5T_STD_I8LE
-            DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-         }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I8LE
-      DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-      DATA {
-      (0,0): 84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119,
-      (0,14): 110, 32,
-      (1,0): 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101,
-      (1,13): 114, 32, 32,
-      (2,0): 116, 104, 101, 32, 53, 32, 108, 97, 122, 121, 32, 100, 111, 103,
-      (2,14): 115, 32
-      }
-   }
-}
-}
diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_regrefatt_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_regrefatt_F03.ddl
deleted file mode 100644
index e154818b..00000000
--- a/FORTRAN/H5T/tfiles/18/112/h5ex_t_regrefatt_F03.ddl
+++ /dev/null
@@ -1,39 +0,0 @@
-HDF5 "h5ex_t_regrefatt_F03.h5" {
-GROUP "/" {
-   DATASET "DS1" {
-      DATATYPE  H5T_STD_I32LE
-      DATASPACE  NULL
-      DATA {
-      }
-      ATTRIBUTE "A1" {
-         DATATYPE  H5T_REFERENCE { H5T_STD_REF_DSETREG }
-         DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
-         DATA {
-            DATASET "h5ex_t_regrefatt_F03.h5/DS2"{
-               REGION_TYPE POINT  (0,1), (2,11), (1,0), (2,4)
-               DATATYPE  H5T_STD_I8LE
-               DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-            }
-            DATASET "h5ex_t_regrefatt_F03.h5/DS2"  {
-               REGION_TYPE BLOCK  (0,0)-(0,2), (0,11)-(0,13), (2,0)-(2,2),
-                (2,11)-(2,13)
-               DATATYPE  H5T_STD_I8LE
-               DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-            }
-         }
-      }
-   }
-   DATASET "DS2" {
-      DATATYPE  H5T_STD_I8LE
-      DATASPACE  SIMPLE { ( 3, 16 ) / ( 3, 16 ) }
-      DATA {
-      (0,0): 84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119,
-      (0,14): 110, 32,
-      (1,0): 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101,
-      (1,13): 114, 32, 32,
-      (2,0): 116, 104, 101, 32, 53, 32, 108, 97, 122, 121, 32, 100, 111, 103,
-      (2,14): 115, 32
-      }
-   }
-}
-}