[svn-r24113] Description:

    Reduce warnings w/gfortran in FORTRAN build by declaring interface for
utility test routines.

Tested on:
    Mac OSX/64 10.8.4 (amazon) w/gcc/g++/gfortran 4.8

21 files changed, 79 insertions, 2 deletions

diff --git a/fortran/test/fflush1.f90 b/fortran/test/fflush1.f90
index d35bfff..c03858f 100644
--- a/fortran/test/fflush1.f90
+++ b/fortran/test/fflush1.f90
@@ -30,6 +30,7 @@
      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 d699150..83e957f 100644
--- a/fortran/test/fflush2.f90
+++ b/fortran/test/fflush2.f90
@@ -30,6 +30,7 @@
      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 6268d15..d54397c 100644
--- a/fortran/test/fortranlib_test.f90
+++ b/fortran/test/fortranlib_test.f90
@@ -27,6 +27,7 @@
 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 dc45560..5bf8f56 100644
--- a/fortran/test/fortranlib_test_1_8.f90
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -27,6 +27,7 @@
 PROGRAM fortranlibtest
 
   USE HDF5
+  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
   INTEGER :: total_error = 0
@@ -116,6 +117,7 @@ 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
@@ -180,6 +182,7 @@ 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
@@ -275,6 +278,7 @@ 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
@@ -424,6 +428,7 @@ 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 cecaded..af65e37 100644
--- a/fortran/test/tH5A.f90
+++ b/fortran/test/tH5A.f90
@@ -36,6 +36,7 @@
 !
 
      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 32cb228..91ddc34 100644
--- a/fortran/test/tH5A_1_8.f90
+++ b/fortran/test/tH5A_1_8.f90
@@ -40,6 +40,7 @@ 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
@@ -213,6 +214,7 @@ 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 - - -
@@ -401,6 +403,7 @@ 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
@@ -532,6 +535,7 @@ 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
 
@@ -746,6 +750,7 @@ 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
 
@@ -951,6 +956,7 @@ 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
 
@@ -1091,6 +1097,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
+  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -1412,6 +1419,7 @@ 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
 
@@ -1773,6 +1781,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
+  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2056,6 +2065,7 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
+  USE H5FORT_TESTS ! This module contains all test routines
 
   IMPLICIT NONE
 
@@ -2207,6 +2217,7 @@ 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
 
@@ -2302,6 +2313,7 @@ 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
 
@@ -2424,6 +2436,7 @@ 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
 
@@ -2623,6 +2636,7 @@ 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
 
@@ -2740,6 +2754,7 @@ 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 9f7b50c..35832c4 100644
--- a/fortran/test/tH5D.f90
+++ b/fortran/test/tH5D.f90
@@ -36,6 +36,7 @@
 !
         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
@@ -252,6 +253,7 @@
 
         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 4d431a1..05fa885 100644
--- a/fortran/test/tH5E.f90
+++ b/fortran/test/tH5E.f90
@@ -36,6 +36,7 @@
 !   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 d8f683c..75c8cd7 100644
--- a/fortran/test/tH5F.f90
+++ b/fortran/test/tH5F.f90
@@ -33,6 +33,8 @@
 !  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
@@ -289,6 +291,7 @@
 
         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
@@ -474,7 +477,8 @@
 !    created using the got property lists
 
         SUBROUTINE plisttest(cleanup, total_error)
-         USE HDF5  ! This module contains all necessary modules
+        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
@@ -574,6 +578,7 @@
 
         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
@@ -702,6 +707,7 @@
 
         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 6befa94..93b6a50 100644
--- a/fortran/test/tH5G.f90
+++ b/fortran/test/tH5G.f90
@@ -35,6 +35,7 @@
 !   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 fd55ba9..7979846 100644
--- a/fortran/test/tH5G_1_8.f90
+++ b/fortran/test/tH5G_1_8.f90
@@ -30,6 +30,7 @@
 !*****
 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
@@ -134,6 +135,7 @@ 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
@@ -450,6 +452,7 @@ 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
@@ -646,6 +649,7 @@ 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
@@ -741,6 +745,7 @@ 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
@@ -948,6 +953,7 @@ 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
@@ -1096,6 +1102,7 @@ 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
@@ -1165,6 +1172,7 @@ 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
@@ -1406,6 +1414,7 @@ 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
@@ -1509,6 +1518,7 @@ 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
@@ -1822,6 +1832,7 @@ 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
@@ -1885,6 +1896,7 @@ 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 184edaf..bb4f24b 100644
--- a/fortran/test/tH5I.f90
+++ b/fortran/test/tH5I.f90
@@ -32,6 +32,7 @@
 !   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 ea91631..2f20037 100644
--- a/fortran/test/tH5O.f90
+++ b/fortran/test/tH5O.f90
@@ -29,6 +29,7 @@
 
 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
@@ -54,6 +55,7 @@ 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
@@ -576,6 +578,7 @@ 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 4c78334..9e8ca5f 100644
--- a/fortran/test/tH5P.f90
+++ b/fortran/test/tH5P.f90
@@ -34,6 +34,7 @@ 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
@@ -150,6 +151,7 @@ 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
@@ -419,6 +421,7 @@ 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 ac105fc..2b19d1b 100644
--- a/fortran/test/tH5R.f90
+++ b/fortran/test/tH5R.f90
@@ -33,6 +33,7 @@
 !
 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
@@ -241,6 +242,7 @@ 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 e3a44ad..b958e6d 100644
--- a/fortran/test/tH5S.f90
+++ b/fortran/test/tH5S.f90
@@ -37,6 +37,7 @@
         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 1cbabe8..9d83350 100644
--- a/fortran/test/tH5Sselect.f90
+++ b/fortran/test/tH5Sselect.f90
@@ -40,6 +40,7 @@
   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
@@ -319,6 +320,7 @@
   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
@@ -695,6 +697,7 @@
 
   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
@@ -1033,6 +1036,7 @@
 
 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
@@ -1359,6 +1363,7 @@ 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
@@ -1781,6 +1786,7 @@ 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 b42a8e6..b833426 100644
--- a/fortran/test/tH5T.f90
+++ b/fortran/test/tH5T.f90
@@ -45,6 +45,7 @@
 
 
      USE HDF5 ! This module contains all necessary modules
+     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
@@ -642,6 +643,7 @@
 !   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
@@ -859,6 +861,7 @@
     SUBROUTINE enumtest(cleanup, total_error)
 
     USE HDF5
+    USE H5FORT_TESTS ! This module contains all test routines
     IMPLICIT NONE
 
     LOGICAL, INTENT(IN)  :: cleanup
@@ -999,6 +1002,7 @@
 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 85feb2b..2a064dd 100644
--- a/fortran/test/tH5VL.f90
+++ b/fortran/test/tH5VL.f90
@@ -29,6 +29,7 @@
 
         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
@@ -189,6 +190,7 @@
 
         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
@@ -360,6 +362,7 @@
 
         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 cd6a343..8145061 100644
--- a/fortran/test/tH5Z.f90
+++ b/fortran/test/tH5Z.f90
@@ -31,7 +31,8 @@
 
 !   This subroutine tests following functionalities: h5zfilter_avail_f, h5zunregister_f
 
-   USE HDF5 ! This module contains all necessary modules
+     USE HDF5 ! This module contains all necessary modules
+     USE H5FORT_TESTS ! This module contains all test routines
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
@@ -165,6 +166,7 @@
 
         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 4f73fda..6303374 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -28,6 +28,10 @@
 !
 !*****
 
+MODULE H5FORT_TESTS
+
+CONTAINS
+
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: verify_real_kind_7
@@ -357,3 +361,5 @@ SUBROUTINE h5_env_nocleanup_f(HDF5_NOCLEANUP)
 
 END SUBROUTINE h5_env_nocleanup_f
 
+END MODULE H5FORT_TESTS
+