diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3961a6780d..4b5a8cdc0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ add_subdirectory(${HLM_ROOT}/src/fates/biogeophys fates_biogeophys)
 add_subdirectory(${HLM_ROOT}/src/fates/parteh fates_parteh)
 add_subdirectory(${HLM_ROOT}/src/fates/fire fates_fire)
 add_subdirectory(${HLM_ROOT}/src/fates/radiation fates_radiation)
-add_subdirectory(${HLM_ROOT}/src/fates/unit_test_shr unit_share)
+add_subdirectory(${HLM_ROOT}/src/fates/unit_testing/unit_test_shr unit_share)
 
 # Remove shr_mpi_mod from share_sources.
 # This is needed because we want to use the mock shr_mpi_mod in place of the real one
@@ -93,5 +93,5 @@ link_directories(${CMAKE_CURRENT_BINARY_DIR})
 # has tests in it. However, it appears that the order needs to be done
 # carefully: for example, include_directories and link_directories needs to be
 # done before adding the tests themselves.
-add_subdirectory(${HLM_ROOT}/src/fates/functional_unit_testing/allometry fates_allom_test)
-add_subdirectory(${HLM_ROOT}/src/fates/functional_unit_testing/math_utils fates_math_test)
\ No newline at end of file
+add_subdirectory(${HLM_ROOT}/src/fates/unit_testing/allometry fates_allom_test)
+add_subdirectory(${HLM_ROOT}/src/fates/unit_testing/math_utils fates_math_test)
diff --git a/functional_unit_testing/allometry/CMakeLists.txt b/unit_testing/allometry/CMakeLists.txt
similarity index 100%
rename from functional_unit_testing/allometry/CMakeLists.txt
rename to unit_testing/allometry/CMakeLists.txt
diff --git a/functional_unit_testing/allometry/FatesTestAllometry.F90 b/unit_testing/allometry/FatesTestAllometry.F90
similarity index 100%
rename from functional_unit_testing/allometry/FatesTestAllometry.F90
rename to unit_testing/allometry/FatesTestAllometry.F90
diff --git a/functional_unit_testing/allometry/allometry_plotting.py b/unit_testing/allometry/allometry_plotting.py
similarity index 100%
rename from functional_unit_testing/allometry/allometry_plotting.py
rename to unit_testing/allometry/allometry_plotting.py
diff --git a/functional_unit_testing/build_fortran_tests.py b/unit_testing/build_fortran_tests.py
similarity index 100%
rename from functional_unit_testing/build_fortran_tests.py
rename to unit_testing/build_fortran_tests.py
diff --git a/functional_unit_testing/math_utils/CMakeLists.txt b/unit_testing/math_utils/CMakeLists.txt
similarity index 100%
rename from functional_unit_testing/math_utils/CMakeLists.txt
rename to unit_testing/math_utils/CMakeLists.txt
diff --git a/functional_unit_testing/math_utils/FatesTestMathUtils.F90 b/unit_testing/math_utils/FatesTestMathUtils.F90
similarity index 100%
rename from functional_unit_testing/math_utils/FatesTestMathUtils.F90
rename to unit_testing/math_utils/FatesTestMathUtils.F90
diff --git a/functional_unit_testing/math_utils/math_plotting.py b/unit_testing/math_utils/math_plotting.py
similarity index 100%
rename from functional_unit_testing/math_utils/math_plotting.py
rename to unit_testing/math_utils/math_plotting.py
diff --git a/functional_unit_testing/path_utils.py b/unit_testing/path_utils.py
similarity index 100%
rename from functional_unit_testing/path_utils.py
rename to unit_testing/path_utils.py
diff --git a/functional_unit_testing/run_fates_tests.py b/unit_testing/run_fates_tests.py
similarity index 100%
rename from functional_unit_testing/run_fates_tests.py
rename to unit_testing/run_fates_tests.py
diff --git a/unit_test_shr/CMakeLists.txt b/unit_testing/unit_test_shr/CMakeLists.txt
similarity index 100%
rename from unit_test_shr/CMakeLists.txt
rename to unit_testing/unit_test_shr/CMakeLists.txt
diff --git a/unit_test_shr/FatesUnitTestIOMod.F90 b/unit_testing/unit_test_shr/FatesUnitTestIOMod.F90
similarity index 100%
rename from unit_test_shr/FatesUnitTestIOMod.F90
rename to unit_testing/unit_test_shr/FatesUnitTestIOMod.F90
diff --git a/unit_test_shr/FatesUnitTestParamReaderMod.F90 b/unit_testing/unit_test_shr/FatesUnitTestParamReaderMod.F90
similarity index 100%
rename from unit_test_shr/FatesUnitTestParamReaderMod.F90
rename to unit_testing/unit_test_shr/FatesUnitTestParamReaderMod.F90
diff --git a/functional_unit_testing/utils.py b/unit_testing/utils.py
similarity index 100%
rename from functional_unit_testing/utils.py
rename to unit_testing/utils.py