diff --git a/configure.ac b/configure.ac
index 0a8253204e..5cae0cd933 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,7 +326,6 @@ AC_CONFIG_FILES([Makefile
docs/Makefile
test_fms/test_common.sh
test_fms/Makefile
- test_fms/ufs_crash/Makefile
test_fms/diag_manager/Makefile
test_fms/data_override/Makefile
test_fms/exchange/Makefile
diff --git a/test_fms/Makefile.am b/test_fms/Makefile.am
index 82f1d1b36e..e266245c2c 100644
--- a/test_fms/Makefile.am
+++ b/test_fms/Makefile.am
@@ -24,7 +24,7 @@
ACLOCAL_AMFLAGS = -I m4
# Make targets will be run in each subdirectory. Order is significant.
-SUBDIRS = ufs_crash diag_manager data_override exchange monin_obukhov drifters \
+SUBDIRS = diag_manager data_override exchange monin_obukhov drifters \
mosaic interpolator fms fms2_io mpp mpp_io time_interp time_manager \
horiz_interp field_manager axis_utils affinity
diff --git a/test_fms/diag_manager/Makefile.am b/test_fms/diag_manager/Makefile.am
index 96a7606551..542560d2c9 100644
--- a/test_fms/diag_manager/Makefile.am
+++ b/test_fms/diag_manager/Makefile.am
@@ -35,10 +35,11 @@ AM_CPPFLAGS = -I${top_srcdir}/include \
LDADD = ${top_builddir}/libFMS/libFMS.la
# Build this test program.
-check_PROGRAMS = test_diag_manager
+check_PROGRAMS = test_diag_manager test_diag_manager_time
# This is the source code for the test.
test_diag_manager_SOURCES = test_diag_manager.F90
+test_diag_manager_time_SOURCES = test_diag_manager_time.F90
# Run the test.
TESTS = test_diag_manager2.sh
diff --git a/test_fms/ufs_crash/diag_table b/test_fms/diag_manager/diagTables/diag_table_24
similarity index 100%
rename from test_fms/ufs_crash/diag_table
rename to test_fms/diag_manager/diagTables/diag_table_24
diff --git a/test_fms/diag_manager/test_diag_manager2.sh b/test_fms/diag_manager/test_diag_manager2.sh
index e41207555b..95956cadee 100755
--- a/test_fms/diag_manager/test_diag_manager2.sh
+++ b/test_fms/diag_manager/test_diag_manager2.sh
@@ -88,8 +88,14 @@ setup_test 20 "Test 20: Get diag_field_id, ID found and not found"
setup_test 21 "Test 21: Add axis attributes"
setup_test 22 "Test 22: Get 'nv' axis id"
setup_test 23 "Test 23: Unstructured grid"
-echo Run with mpp_io
+
+echo "Test 24: Modified diag_table"
rm -f input.nml diag_table
+touch input.nml
+cp $top_srcdir/test_fms/diag_manager/diagTables/diag_table_24 diag_table
+run_test test_diag_manager_time 1
+
+echo Run with mpp_io
setup_test_mppio 1 "Test 1: Data array is too large in x and y direction"
setup_test_mppio 2 "Test 2: Data array is too large in x direction"
setup_test_mppio 3 "Test 3: Data array is too large in y direction"
diff --git a/test_fms/ufs_crash/test_diag_manager_time.F90 b/test_fms/diag_manager/test_diag_manager_time.F90
similarity index 58%
rename from test_fms/ufs_crash/test_diag_manager_time.F90
rename to test_fms/diag_manager/test_diag_manager_time.F90
index 540f0e83b2..d3da58426a 100644
--- a/test_fms/ufs_crash/test_diag_manager_time.F90
+++ b/test_fms/diag_manager/test_diag_manager_time.F90
@@ -1,4 +1,29 @@
-program test_diag_manager
+!***********************************************************************
+!* GNU Lesser General Public License
+!*
+!* This file is part of the GFDL Flexible Modeling System (FMS).
+!*
+!* FMS is free software: you can redistribute it and/or modify it under
+!* the terms of the GNU Lesser General Public License as published by
+!* the Free Software Foundation, either version 3 of the License, or (at
+!* your option) any later version.
+!*
+!* FMS is distributed in the hope that it will be useful, but WITHOUT
+!* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+!* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+!* for more details.
+!*
+!* You should have received a copy of the GNU Lesser General Public
+!* License along with FMS. If not, see .
+!***********************************************************************
+
+!> @brief This programs tests diat_manager with the following diag_table
+!! test_diag_manager
+!! 2 1 1 0 0 0
+!! "ocn%4yr%2mo%2dy%2hr", 1, "days", 1, "days", "time", 1, "days", "2 1 1 0 0 0"
+!! "test_diag_manager_mod", "sst", "sst", "ocn%4yr%2mo%2dy%2hr", "all", .true., "none", 2
+
+program test_diag_manager_time
use mpp_domains_mod
use diag_manager_mod
@@ -71,4 +96,4 @@ program test_diag_manager
call diag_manager_end(Time)
call fms_end
-end program test_diag_manager
+end program test_diag_manager_time
diff --git a/test_fms/ufs_crash/Makefile.am b/test_fms/ufs_crash/Makefile.am
deleted file mode 100644
index 1fb5affc97..0000000000
--- a/test_fms/ufs_crash/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-#***********************************************************************
-#* GNU Lesser General Public License
-#*
-#* This file is part of the GFDL Flexible Modeling System (FMS).
-#*
-#* FMS is free software: you can redistribute it and/or modify it under
-#* the terms of the GNU Lesser General Public License as published by
-#* the Free Software Foundation, either version 3 of the License, or (at
-#* your option) any later version.
-#*
-#* FMS is distributed in the hope that it will be useful, but WITHOUT
-#* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-#* for more details.
-#*
-#* You should have received a copy of the GNU Lesser General Public
-#* License along with FMS. If not, see .
-#***********************************************************************
-
-# This is an automake file for the test_fms/diag_manager directory of the FMS
-# package.
-# uramirez, Ed Hartnett
-
-# Find the needed mod and .inc files.
-AM_CPPFLAGS = -I${top_srcdir}/include \
- -I${top_builddir}/mpp \
- -I${top_builddir}/fms \
- -I${top_builddir}/axis_utils \
- -I${top_builddir}/diag_manager \
- -I${top_builddir}/time_manager \
- -I${top_builddir}/constants \
- -I${top_builddir}/platform
-
-# Link to the FMS library.
-LDADD = ${top_builddir}/libFMS/libFMS.la
-
-# Build this test program.
-check_PROGRAMS = test_diag_manager_time
-
-# This is the source code for the test.
-test_diag_manager_time_SOURCES = test_diag_manager_time.F90
-
-# Run the test.
-TESTS = test_diag_manager2.sh
-
-# Copy over other needed files to the srcdir
-EXTRA_DIST = input.nml diag_table test_diag_manager2.sh
-
-CLEANFILES = *.nc *.out
diff --git a/test_fms/ufs_crash/input.nml b/test_fms/ufs_crash/input.nml
deleted file mode 100644
index 74920fcb56..0000000000
--- a/test_fms/ufs_crash/input.nml
+++ /dev/null
@@ -1,3 +0,0 @@
-&diag_manager_nml
-use_mpp_io = .false.
-/
diff --git a/test_fms/ufs_crash/test_diag_manager2.sh b/test_fms/ufs_crash/test_diag_manager2.sh
deleted file mode 100755
index 6ce07884e1..0000000000
--- a/test_fms/ufs_crash/test_diag_manager2.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-#***********************************************************************
-#* GNU Lesser General Public License
-#*
-#* This file is part of the GFDL Flexible Modeling System (FMS).
-#*
-#* FMS is free software: you can redistribute it and/or modify it under
-#* the terms of the GNU Lesser General Public License as published by
-#* the Free Software Foundation, either version 3 of the License, or (at
-#* your option) any later version.
-#*
-#* FMS is distributed in the hope that it will be useful, but WITHOUT
-#* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-#* for more details.
-#*
-#* You should have received a copy of the GNU Lesser General Public
-#* License along with FMS. If not, see .
-#***********************************************************************
-
-# This is part of the GFDL FMS package. This is a shell script to
-# execute tests in the test_fms/data_override directory.
-
-# Ed Hartnett 11/26/19
-
-# Set common test settings.
-. ../test_common.sh
-cp $top_srcdir/test_fms/ufs_crash/input.nml input.nml
-cp $top_srcdir/test_fms/ufs_crash/diag_table diag_table
-run_test test_diag_manager_time 1
-rm -f input.nml diag_table