diff --git a/tests/chgres_cube/CMakeLists.txt b/tests/chgres_cube/CMakeLists.txt
index d4a9570a2..6f665d2f9 100644
--- a/tests/chgres_cube/CMakeLists.txt
+++ b/tests/chgres_cube/CMakeLists.txt
@@ -29,24 +29,20 @@ execute_process( COMMAND ${CMAKE_COMMAND} -E copy
     ${CMAKE_CURRENT_SOURCE_DIR}/config_spectral_sigio.nml ${CMAKE_CURRENT_BINARY_DIR}/config_spectral_sigio.nml)
 
 add_executable(ftst_utils ftst_utils.F90)
-add_test(NAME ftst_utils COMMAND ftst_utils)
-target_link_libraries(ftst_utils
-  chgres_cube_lib)
+add_test(NAME chgres_cube-ftst_utils COMMAND ftst_utils)
+target_link_libraries(ftst_utils chgres_cube_lib)
 
 add_executable(ftst_program_setup ftst_program_setup.F90)
-target_link_libraries(ftst_program_setup
-  chgres_cube_lib)
+target_link_libraries(ftst_program_setup chgres_cube_lib)
 
 # Cause test to be run with MPI.
-add_mpi_test(ftst_program_setup
+add_mpi_test(chgres_cube-ftst_program_setup
   EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ftst_program_setup
   NUMPROCS 4
   TIMEOUT 60)
 
 add_executable(ftst_search_util ftst_search_util.F90)
-target_link_libraries(
-  ftst_search_util
-  chgres_cube_lib)
+target_link_libraries(ftst_search_util chgres_cube_lib)
 
 if(OpenMP_Fortran_FOUND)
   target_link_libraries(ftst_search_util OpenMP::OpenMP_Fortran)
@@ -54,17 +50,16 @@ endif()
 
 # Cause test to be run with MPI. The search routine was
 # written to work on a single task. So set NUMPROCS to 1.
-add_mpi_test(ftst_search_util
+add_mpi_test(chgres_cube-ftst_search_util
   EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ftst_search_util
   NUMPROCS 1
   TIMEOUT 60)
 
 add_executable(ftst_sfc_input_data ftst_sfc_input_data.F90)
-target_link_libraries(ftst_sfc_input_data
-  chgres_cube_lib)
+target_link_libraries(ftst_sfc_input_data chgres_cube_lib)
 
 # Cause test to be run with MPI.
-add_mpi_test(ftst_sfc_input_data
+add_mpi_test(chgres_cube-ftst_sfc_input_data
   EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ftst_sfc_input_data
   NUMPROCS 4
   TIMEOUT 60)
diff --git a/tests/fre-nctools/shared_lib/CMakeLists.txt b/tests/fre-nctools/shared_lib/CMakeLists.txt
index 9d6f95aba..5827563c2 100644
--- a/tests/fre-nctools/shared_lib/CMakeLists.txt
+++ b/tests/fre-nctools/shared_lib/CMakeLists.txt
@@ -6,7 +6,7 @@
 include_directories(${CMAKE_SOURCE_DIR}/sorc/fre-nctools.fd/shared_lib)
 
 add_executable(tst_create_xgrid tst_create_xgrid.c)
-add_test(NAME tst_create_xgrid COMMAND tst_create_xgrid)
+add_test(NAME fre-nctools-tst_create_xgrid COMMAND tst_create_xgrid)
 target_link_libraries(tst_create_xgrid NetCDF::NetCDF_C shared_lib m)