diff --git a/CMakeLists.txt b/CMakeLists.txt
index e094455258..51768e79d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -657,7 +657,7 @@ list(APPEND TEST_SRC_SINGLE_TARGET
   test_fms/diag_manager/check_var_masks.F90
   test_fms/diag_manager/test_multiple_send_data.F90
   test_fms/diag_manager/test_prepend_date.F90
-  test_fms/diag_manager/test_multi_file.F90
+  test_fms/diag_manager/test_diag_multi_file.F90
   test_fms/diag_manager/test_ens_runs.F90
   test_fms/diag_manager/test_diag_attribute_add.F90
   test_fms/diag_manager/check_new_file_freq.F90
diff --git a/test_fms/data_override/Makefile.am b/test_fms/data_override/Makefile.am
index 55c5d210ae..c43fb1789d 100644
--- a/test_fms/data_override/Makefile.am
+++ b/test_fms/data_override/Makefile.am
@@ -72,12 +72,12 @@ TESTS_ENVIRONMENT+= test_input_path="@TEST_INPUT_PATH@"
 
 TESTS = test_data_override2.sh test_data_override_init.sh test_data_override2_mono.sh test_data_override2_ongrid.sh \
         test_data_override2_scalar.sh test_data_override_weights.sh test_data_override_ensembles.sh \
-        test_multi_file.sh
+        test_data_override_multi_file.sh
 
 # Include these files with the distribution.
 EXTRA_DIST = test_data_override2.sh test_data_override_init.sh test_data_override2_mono.sh test_data_override2_ongrid.sh \
              test_data_override2_scalar.sh test_data_override_weights.sh test_data_override_ensembles.sh \
-             test_multi_file.sh
+             test_data_override_multi_file.sh
 
 # Clean up
 CLEANFILES = input.nml *.nc* *.out diag_table data_table data_table.yaml INPUT/* *.dpi *.spi *.dyn *.spl *-files/*
diff --git a/test_fms/data_override/include/test_data_override_ongrid.inc b/test_fms/data_override/include/test_data_override_ongrid.inc
index 3dbda6af63..5a19f96db9 100644
--- a/test_fms/data_override/include/test_data_override_ongrid.inc
+++ b/test_fms/data_override/include/test_data_override_ongrid.inc
@@ -224,7 +224,7 @@ subroutine ENSEMBLE_TEST_
 end subroutine ENSEMBLE_TEST_
 
 subroutine MULTI_FILE_TESTS_
-  integer, parameter                       :: lkind = DO_TEST_KIND_ !< Real precision of the test
+  integer, parameter                       :: lkind = TEST_FMS_KIND_ !< Real precision of the test
   real(lkind)                              :: expected_result       !< Expected result from data_override
   type(time_type)                          :: Time                  !< Time
   real(lkind), allocatable, dimension(:,:) :: runoff                !< Data to be written
@@ -256,4 +256,4 @@ subroutine MULTI_FILE_TESTS_
   expected_result = 5._lkind
   call COMPARE_DATA_ (Domain, runoff, expected_result)
 
-end subroutine MULTI_FILE_TESTS_
\ No newline at end of file
+end subroutine MULTI_FILE_TESTS_
diff --git a/test_fms/data_override/test_multi_file.sh b/test_fms/data_override/test_data_override_multi_file.sh
similarity index 100%
rename from test_fms/data_override/test_multi_file.sh
rename to test_fms/data_override/test_data_override_multi_file.sh
diff --git a/test_fms/diag_manager/Makefile.am b/test_fms/diag_manager/Makefile.am
index a005913b5c..7117ab772a 100644
--- a/test_fms/diag_manager/Makefile.am
+++ b/test_fms/diag_manager/Makefile.am
@@ -34,7 +34,7 @@ check_PROGRAMS = test_diag_manager test_diag_manager_time \
  check_time_min check_time_max check_time_sum check_time_avg test_diag_diurnal check_time_diurnal \
  check_time_pow check_time_rms check_subregional test_cell_measures test_var_masks \
  check_var_masks test_multiple_send_data test_diag_out_yaml test_output_every_freq \
- test_dm_weights test_prepend_date test_ens_runs test_multi_file test_diag_attribute_add \
+ test_dm_weights test_prepend_date test_ens_runs test_diag_multi_file test_diag_attribute_add \
  check_new_file_freq test_zbounds_limits
 
 # This is the source code for the test.
@@ -66,7 +66,7 @@ test_var_masks_SOURCES = test_var_masks.F90
 check_var_masks_SOURCES = check_var_masks.F90
 test_multiple_send_data_SOURCES = test_multiple_send_data.F90
 test_prepend_date_SOURCES = test_prepend_date.F90
-test_multi_file_SOURCES = test_multi_file.F90
+test_diag_multi_file_SOURCES = test_diag_multi_file.F90
 test_ens_runs_SOURCES = test_ens_runs.F90
 test_diag_attribute_add_SOURCES = test_diag_attribute_add.F90
 check_new_file_freq_SOURCES = check_new_file_freq.F90
@@ -80,7 +80,7 @@ SH_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 TESTS = test_diag_manager2.sh test_time_none.sh test_time_min.sh test_time_max.sh test_time_sum.sh \
         test_time_avg.sh test_time_pow.sh test_time_rms.sh test_time_diurnal.sh test_cell_measures.sh \
         test_subregional.sh test_var_masks.sh test_multiple_send_data.sh test_output_every_freq.sh \
-        test_dm_weights.sh test_flush_nc_file.sh test_prepend_date.sh test_ens_runs.sh test_multi_file.sh \
+        test_dm_weights.sh test_flush_nc_file.sh test_prepend_date.sh test_ens_runs.sh test_diag_multi_file.sh \
         test_diag_attribute_add.sh test_zbounds_limits.sh
 
 testing_utils.mod: testing_utils.$(OBJEXT)
@@ -90,7 +90,7 @@ EXTRA_DIST = test_diag_manager2.sh check_crashes.sh test_time_none.sh test_time_
              test_time_sum.sh test_time_avg.sh test_time_pow.sh test_time_rms.sh test_time_diurnal.sh \
              test_cell_measures.sh test_subregional.sh test_var_masks.sh test_multiple_send_data.sh \
              test_flush_nc_file.sh test_dm_weights.sh test_output_every_freq.sh test_prepend_date.sh \
-             test_ens_runs.sh test_multi_file.sh test_diag_attribute_add.sh test_zbounds_limits.sh
+             test_ens_runs.sh test_diag_multi_file.sh test_diag_attribute_add.sh test_zbounds_limits.sh
 
 if USING_YAML
   TESTS_ENVIRONMENT = parser_skip=""
diff --git a/test_fms/diag_manager/test_multi_file.F90 b/test_fms/diag_manager/test_diag_multi_file.F90
similarity index 100%
rename from test_fms/diag_manager/test_multi_file.F90
rename to test_fms/diag_manager/test_diag_multi_file.F90
diff --git a/test_fms/diag_manager/test_multi_file.sh b/test_fms/diag_manager/test_diag_multi_file.sh
similarity index 96%
rename from test_fms/diag_manager/test_multi_file.sh
rename to test_fms/diag_manager/test_diag_multi_file.sh
index 34ae5d59cc..05e712289f 100755
--- a/test_fms/diag_manager/test_multi_file.sh
+++ b/test_fms/diag_manager/test_diag_multi_file.sh
@@ -51,7 +51,7 @@ rm -f *.nc
 my_test_count=1
 printf "&diag_manager_nml \n use_modern_diag=.true. \n/" | cat > input.nml
 test_expect_success "Running diag_manager (test $my_test_count)" '
-  mpirun -n 1 ../test_multi_file
+  mpirun -n 1 ../test_diag_multi_file
 '
 
 ###########################################################################
@@ -86,7 +86,7 @@ cat <<_EOF > input.nml
 /
 _EOF
 test_expect_success "Running diag_manager (test $my_test_count)" '
-  mpirun -n 1 ../test_multi_file
+  mpirun -n 1 ../test_diag_multi_file
 '
 
 ###########################################################################
@@ -119,7 +119,7 @@ cat <<_EOF > input.nml
 /
 _EOF
 test_expect_success "Running diag_manager (test $my_test_count)" '
-  mpirun -n 1 ../test_multi_file
+  mpirun -n 1 ../test_diag_multi_file
 '
 
 ###########################################################################
@@ -154,7 +154,7 @@ cat <<_EOF > input.nml
 /
 _EOF
 test_expect_success "Running diag_manager (test $my_test_count)" '
-  mpirun -n 1 ../test_multi_file
+  mpirun -n 1 ../test_diag_multi_file
 '
 fi
 test_done