[svn-r24114] Reverting the changes in r24113 for now because they break parallel make fortran. The changes aren't incorrect, but more work in needed on dependencies and also for enable-parallel.

Reverted to r24112. 

21 files changed, 2 insertions, 79 deletions

diff --git a/fortran/test/fflush1.f90 b/fortran/test/fflush1.f90
index c03858f..d35bfff 100644
--- a/fortran/test/fflush1.f90
+++ b/fortran/test/fflush1.f90
@@ -30,7 +30,6 @@
      PROGRAM FFLUSH1EXAMPLE
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
 
diff --git a/fortran/test/fflush2.f90 b/fortran/test/fflush2.f90
index 83e957f..d699150 100644
--- a/fortran/test/fflush2.f90
+++ b/fortran/test/fflush2.f90
@@ -30,7 +30,6 @@
      PROGRAM FFLUSH2EXAMPLE
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
 
diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90
index d54397c..6268d15 100644
--- a/fortran/test/fortranlib_test.f90
+++ b/fortran/test/fortranlib_test.f90
@@ -27,7 +27,6 @@
 PROGRAM fortranlibtest
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER :: total_error = 0
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
index 5bf8f56..dc45560 100644
--- a/fortran/test/fortranlib_test_1_8.f90
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -27,7 +27,6 @@
 PROGRAM fortranlibtest
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER :: total_error = 0
@@ -117,7 +116,6 @@ END PROGRAM fortranlibtest
 
 SUBROUTINE dtransform(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -182,7 +180,6 @@ END SUBROUTINE dtransform
 SUBROUTINE test_genprop_basic_class(cleanup, total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -278,7 +275,6 @@ SUBROUTINE test_h5s_encode(cleanup, total_error)
 !****************************************************************/
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -428,7 +424,6 @@ END SUBROUTINE test_h5s_encode
 SUBROUTINE test_scaleoffset(cleanup, total_error )
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90
index af65e37..cecaded 100644
--- a/fortran/test/tH5A.f90
+++ b/fortran/test/tH5A.f90
@@ -36,7 +36,6 @@
 !
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90
index 91ddc34..32cb228 100644
--- a/fortran/test/tH5A_1_8.f90
+++ b/fortran/test/tH5A_1_8.f90
@@ -40,7 +40,6 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
 !
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -214,7 +213,6 @@ SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
 ! Needed for get_info_by_name
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 ! - - - arg types - - -
@@ -403,7 +401,6 @@ SUBROUTINE test_attr_null_space(fcpl, fapl, total_error)
 !**
 !****************************************************************/
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
   IMPLICIT NONE
 
   INTEGER(HID_T), INTENT(IN) :: fcpl
@@ -535,7 +532,6 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -750,7 +746,6 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -956,7 +951,6 @@ END SUBROUTINE test_attr_info_by_idx
 SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error )
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -1097,7 +1091,6 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -1419,7 +1412,6 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -1781,7 +1773,6 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2065,7 +2056,6 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2217,7 +2207,6 @@ END SUBROUTINE test_attr_dense_open
 SUBROUTINE test_attr_dense_verify(loc_id, max_attr, total_error)
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2313,7 +2302,6 @@ END SUBROUTINE test_attr_dense_verify
 SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2436,7 +2424,6 @@ END SUBROUTINE test_attr_corder_create_basic
 SUBROUTINE test_attr_basic_write(fapl, total_error)
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2636,7 +2623,6 @@ END SUBROUTINE test_attr_basic_write
 SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error)
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2754,7 +2740,6 @@ END SUBROUTINE test_attr_many
 SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER(HID_T), INTENT(IN) :: fid
diff --git a/fortran/test/tH5D.f90 b/fortran/test/tH5D.f90
index 35832c4..9f7b50c 100644
--- a/fortran/test/tH5D.f90
+++ b/fortran/test/tH5D.f90
@@ -36,7 +36,6 @@
 !
         SUBROUTINE datasettest(cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
@@ -253,7 +252,6 @@
 
         SUBROUTINE extenddsettest(cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5E.f90 b/fortran/test/tH5E.f90
index 05fa885..4d431a1 100644
--- a/fortran/test/tH5E.f90
+++ b/fortran/test/tH5E.f90
@@ -36,7 +36,6 @@
 !   This subroutine tests following functionalities: h5eprint_f
 
    USE HDF5 ! This module contains all necessary modules
-   USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90
index 75c8cd7..d8f683c 100644
--- a/fortran/test/tH5F.f90
+++ b/fortran/test/tH5F.f90
@@ -33,8 +33,6 @@
 !  in the first file. 
         SUBROUTINE mountingtest(cleanup, total_error)
         USE HDF5  ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
-
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
           INTEGER, INTENT(OUT) :: total_error
@@ -291,7 +289,6 @@
 
         SUBROUTINE reopentest(cleanup, total_error)
         USE HDF5  ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
           INTEGER, INTENT(OUT) :: total_error
@@ -477,8 +474,7 @@
 !    created using the got property lists
 
         SUBROUTINE plisttest(cleanup, total_error)
-        USE HDF5  ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
+         USE HDF5  ! This module contains all necessary modules
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
           INTEGER, INTENT(OUT) :: total_error
@@ -578,7 +574,6 @@
 
         SUBROUTINE file_close(cleanup, total_error)
         USE HDF5  ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
           INTEGER, INTENT(OUT) :: total_error
@@ -707,7 +702,6 @@
 
         SUBROUTINE file_space(filename, cleanup, total_error)
         USE HDF5  ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
           IMPLICIT NONE
           CHARACTER(*), INTENT(IN) :: filename
           LOGICAL, INTENT(IN) :: cleanup
diff --git a/fortran/test/tH5G.f90 b/fortran/test/tH5G.f90
index 93b6a50..6befa94 100644
--- a/fortran/test/tH5G.f90
+++ b/fortran/test/tH5G.f90
@@ -35,7 +35,6 @@
 !   h5gget_comment_f
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90
index 7979846..fd55ba9 100644
--- a/fortran/test/tH5G_1_8.f90
+++ b/fortran/test/tH5G_1_8.f90
@@ -30,7 +30,6 @@
 !*****
 SUBROUTINE group_test(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -135,7 +134,6 @@ END SUBROUTINE group_test
 SUBROUTINE group_info(cleanup, fapl, total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
@@ -452,7 +450,6 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
    SUBROUTINE timestamps(cleanup, fapl, total_error)
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      INTEGER, INTENT(OUT) :: total_error
@@ -649,7 +646,6 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
    SUBROUTINE mklinks(fapl, total_error)
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      INTEGER, INTENT(OUT) :: total_error
@@ -745,7 +741,6 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
   SUBROUTINE test_move_preserves(fapl_id, total_error)
 
     USE HDF5 ! This module contains all necessary modules
-    USE H5FORT_TESTS ! This module contains all test routines
 
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: total_error
@@ -953,7 +948,6 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
 
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
@@ -1102,7 +1096,6 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
 
 !    USE ISO_C_BINDING
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
@@ -1172,7 +1165,6 @@ END SUBROUTINE cklinks
 SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
@@ -1414,7 +1406,6 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
     hard_link, use_index, total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(INOUT) :: total_error
@@ -1518,7 +1509,6 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   SUBROUTINE test_lcpl(cleanup, fapl, total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(INOUT) :: total_error
@@ -1832,7 +1822,6 @@ END SUBROUTINE test_lcpl
 SUBROUTINE objcopy(fapl, total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(INOUT) :: total_error
@@ -1896,7 +1885,6 @@ END SUBROUTINE objcopy
 SUBROUTINE lapl_nlinks( fapl, total_error)
 
   USE HDF5
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER(HID_T), INTENT(IN) :: fapl
diff --git a/fortran/test/tH5I.f90 b/fortran/test/tH5I.f90
index bb4f24b..184edaf 100644
--- a/fortran/test/tH5I.f90
+++ b/fortran/test/tH5I.f90
@@ -32,7 +32,6 @@
 !   This subroutine tests following functionalities: h5iget_type_f
 
    USE HDF5 ! This module contains all necessary modules
-   USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5O.f90 b/fortran/test/tH5O.f90
index 2f20037..ea91631 100644
--- a/fortran/test/tH5O.f90
+++ b/fortran/test/tH5O.f90
@@ -29,7 +29,6 @@
 
 SUBROUTINE test_h5o(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -55,7 +54,6 @@ END SUBROUTINE test_h5o
 SUBROUTINE test_h5o_link(total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
@@ -578,7 +576,6 @@ END SUBROUTINE test_h5o_link
 SUBROUTINE test_h5o_plist(total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90
index 9e8ca5f..4c78334 100644
--- a/fortran/test/tH5P.f90
+++ b/fortran/test/tH5P.f90
@@ -34,7 +34,6 @@ SUBROUTINE external_test(cleanup, total_error)
 !   h5pget_external_f
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
   
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -151,7 +150,6 @@ END SUBROUTINE external_test
 
 SUBROUTINE multi_file_test(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
   
   IMPLICIT NONE
   LOGICAL, INTENT(IN) :: cleanup
@@ -421,7 +419,6 @@ END SUBROUTINE multi_file_test
 SUBROUTINE test_chunk_cache(cleanup, total_error) 
 
   USE HDF5 ! This module contains all necessary modules 
-  USE H5FORT_TESTS ! This module contains all test routines
   
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5R.f90 b/fortran/test/tH5R.f90
index 2b19d1b..ac105fc 100644
--- a/fortran/test/tH5R.f90
+++ b/fortran/test/tH5R.f90
@@ -33,7 +33,6 @@
 !
 SUBROUTINE refobjtest(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(OUT) :: total_error
@@ -242,7 +241,6 @@ END SUBROUTINE refobjtest
 !
 SUBROUTINE refregtest(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 !  use iso_c_binding  ! NOTE: if this is uncommented, then need to move subroutine into another file.
 
   IMPLICIT NONE
diff --git a/fortran/test/tH5S.f90 b/fortran/test/tH5S.f90
index b958e6d..e3a44ad 100644
--- a/fortran/test/tH5S.f90
+++ b/fortran/test/tH5S.f90
@@ -37,7 +37,6 @@
         SUBROUTINE dataspace_basic_test(cleanup, total_error)
 
         USE HDF5 ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5Sselect.f90 b/fortran/test/tH5Sselect.f90
index 9d83350..1cbabe8 100644
--- a/fortran/test/tH5Sselect.f90
+++ b/fortran/test/tH5Sselect.f90
@@ -40,7 +40,6 @@
   SUBROUTINE test_select_hyperslab(cleanup, total_error)
 
     USE HDF5 ! This module contains all necessary modules
-    USE H5FORT_TESTS ! This module contains all test routines
 
     IMPLICIT NONE
     LOGICAL, INTENT(IN) :: cleanup
@@ -320,7 +319,6 @@
   SUBROUTINE test_select_element(cleanup, total_error)
 
     USE HDF5 ! This module contains all necessary modules
-    USE H5FORT_TESTS ! This module contains all test routines
 
     IMPLICIT NONE
     LOGICAL, INTENT(IN)  :: cleanup
@@ -697,7 +695,6 @@
 
   SUBROUTINE test_basic_select(cleanup, total_error)
     USE HDF5 ! This module contains all necessary modules
-    USE H5FORT_TESTS ! This module contains all test routines
 
     IMPLICIT NONE
     LOGICAL, INTENT(IN)  :: cleanup
@@ -1036,7 +1033,6 @@
 
 SUBROUTINE test_select_point(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules 
-  USE H5FORT_TESTS ! This module contains all test routines
   
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -1363,7 +1359,6 @@ END SUBROUTINE test_select_point
 
 SUBROUTINE test_select_combine(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules 
-  USE H5FORT_TESTS ! This module contains all test routines
   
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
@@ -1786,7 +1781,6 @@ END SUBROUTINE test_select_combine
 
 SUBROUTINE test_select_bounds(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules 
-  USE H5FORT_TESTS ! This module contains all test routines
   
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90
index b833426..b42a8e6 100644
--- a/fortran/test/tH5T.f90
+++ b/fortran/test/tH5T.f90
@@ -45,7 +45,6 @@
 
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
@@ -643,7 +642,6 @@
 !   H5tset_cset_f, H5tget_strpad_f, H5tset_strpad_f
 
      USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
@@ -861,7 +859,6 @@
     SUBROUTINE enumtest(cleanup, total_error)
 
     USE HDF5
-    USE H5FORT_TESTS ! This module contains all test routines
     IMPLICIT NONE
 
     LOGICAL, INTENT(IN)  :: cleanup
@@ -1002,7 +999,6 @@
 SUBROUTINE test_derived_flt(cleanup, total_error)
 
   USE HDF5 ! This module contains all necessary modules
-  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
diff --git a/fortran/test/tH5VL.f90 b/fortran/test/tH5VL.f90
index 2a064dd..85feb2b 100644
--- a/fortran/test/tH5VL.f90
+++ b/fortran/test/tH5VL.f90
@@ -29,7 +29,6 @@
 
         SUBROUTINE vl_test_integer(cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
@@ -190,7 +189,6 @@
 
         SUBROUTINE vl_test_real(cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
@@ -362,7 +360,6 @@
 
         SUBROUTINE vl_test_string(cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90
index 8145061..cd6a343 100644
--- a/fortran/test/tH5Z.f90
+++ b/fortran/test/tH5Z.f90
@@ -31,8 +31,7 @@
 
 !   This subroutine tests following functionalities: h5zfilter_avail_f, h5zunregister_f
 
-     USE HDF5 ! This module contains all necessary modules
-     USE H5FORT_TESTS ! This module contains all test routines
+   USE HDF5 ! This module contains all necessary modules
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
@@ -166,7 +165,6 @@
 
         SUBROUTINE szip_test(szip_flag, cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules
-        USE H5FORT_TESTS ! This module contains all test routines
 
           IMPLICIT NONE
           LOGICAL, INTENT(OUT) :: szip_flag
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index 6303374..4f73fda 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -28,10 +28,6 @@
 !
 !*****
 
-MODULE H5FORT_TESTS
-
-CONTAINS
-
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: verify_real_kind_7
@@ -361,5 +357,3 @@ SUBROUTINE h5_env_nocleanup_f(HDF5_NOCLEANUP)
 
 END SUBROUTINE h5_env_nocleanup_f
 
-END MODULE H5FORT_TESTS
-