diff --git a/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake b/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake
index 04fe70e8f92db1dcc325c8cb2ba175b135d48915..9f6d062dae311b98c02ea01fa1dad1645c50239f 100644
--- a/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake
+++ b/cmake/std/atdm/ride/tweaks/CUDA-DEBUG-CUDA.cmake
@@ -1 +1,6 @@
+# #2410: This passes in the CUDA-RELESE-CUDA build so it is okay to disable in
+# this DEBUG build.  This is likey related to the mix-lanauage compiler defect
+# reported in #1208.
+ATDM_SET_ENABLE(TeuchosNumerics_LAPACK_test_MPI_1_DISABLE ON)
+
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/CUDA_COMMON_TWEAKS.cmake")
diff --git a/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake b/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake
index fd39fda64024b3a36aa49c6763f5d9d24de94912..4e4fb8e29292f5daceda26b6e85def1636d84bd2 100644
--- a/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake
+++ b/cmake/std/atdm/ride/tweaks/GNU-DEBUG-OPENMP.cmake
@@ -1,2 +1,4 @@
-#ATDM_SET_ENABLE(KokkosCore_UnitTest_OpenMP_MPI_1_DISABLE ON)
-#ATDM_SET_ENABLE(KokkosCore_UnitTest_Serial_MPI_1_DISABLE ON)
+# #2410: This passes in the GNU-RELESE-OPENMP build so it is okay to disable
+# in this DEBUG build.  This is likey related to the mix-lanauage compiler
+# defect reported in #1208.
+ATDM_SET_ENABLE(TeuchosNumerics_LAPACK_test_MPI_1_DISABLE ON)
diff --git a/cmake/std/atdm/utils/checkin-test-atdm-single.sh b/cmake/std/atdm/utils/checkin-test-atdm-single.sh
index b7094908015353b45011891da79336b5f13a97f6..96fd426961b5b509b21ed776ef2ac2d6df786965 100755
--- a/cmake/std/atdm/utils/checkin-test-atdm-single.sh
+++ b/cmake/std/atdm/utils/checkin-test-atdm-single.sh
@@ -15,7 +15,8 @@ else
   CHECKIN_TEST_USE_NINJA_ARG=
 fi
 
-echo "-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/atdm/ATDMDevEnv.cmake" \
+echo "-DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/atdm/ATDMDevEnv.cmake
+-DTrilinos_TRACE_ADD_TEST=ON" \
 >> $ATDM_JOB_NAME_KEYS.config
 
 echo