diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 469505b3d6..6136864249 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1311,62 +1311,62 @@ if(QUDA_DIRAC_NDEG_TWISTED_CLOVER)
     --enable-testing true 
     --gtest_output=xml:eigensolve_test_ndeg_twisted_clover_asym.xml)
 endif()
-  
+
 if(QUDA_DIRAC_DOMAIN_WALL)
   add_test(NAME eigensolve_test_domain_wall
     COMMAND ${QUDA_CTEST_LAUNCH} $<TARGET_FILE:eigensolve_test> ${MPIEXEC_POSTFLAGS}
-    --dslash-type domain-wall --prec ${prec}
+    --dslash-type domain-wall
     --dim 2 4 6 8 --Lsdim 4 --eig-n-conv 24 --eig-n-ev 24 --eig-n-kr 128
     --eig-tol ${tol} --eig-max-restarts 1000
-    --matpc even-even --enable-testing true 
+    --matpc even-even --enable-testing true
     --gtest_output=xml:eigensolve_test_domain_wall.xml)
 
   add_test(NAME eigensolve_test_domain_wall_4d_sym
     COMMAND ${QUDA_CTEST_LAUNCH} $<TARGET_FILE:eigensolve_test> ${MPIEXEC_POSTFLAGS}
-    --dslash-type domain-wall-4d --prec ${prec}
+    --dslash-type domain-wall-4d
     --dim 2 4 6 8 --Lsdim 4 --eig-n-conv 24 --eig-n-ev 24 --eig-n-kr 128
     --eig-tol ${tol} --eig-max-restarts 1000
-    --matpc even-even --enable-testing true 
+    --matpc even-even --enable-testing true
     --gtest_output=xml:eigensolve_test_domain_wall_4d_sym.xml)
 
   add_test(NAME eigensolve_test_domain_wall_4d_asym
     COMMAND ${QUDA_CTEST_LAUNCH} $<TARGET_FILE:eigensolve_test> ${MPIEXEC_POSTFLAGS}
-    --dslash-type domain-wall-4d --prec ${prec}
+    --dslash-type domain-wall-4d
     --dim 2 4 6 8 --Lsdim 4 --eig-n-conv 24 --eig-n-ev 24 --eig-n-kr 128
     --eig-tol ${tol} --eig-max-restarts 1000
-    --matpc even-even-asym --enable-testing true 
+    --matpc even-even-asym --enable-testing true
     --gtest_output=xml:eigensolve_test_domain_wall_4d_asym.xml)
 
   add_test(NAME eigensolve_test_mobius_sym
     COMMAND ${QUDA_CTEST_LAUNCH} $<TARGET_FILE:eigensolve_test> ${MPIEXEC_POSTFLAGS}
-    --dslash-type mobius --prec ${prec}
+    --dslash-type mobius
     --dim 2 4 6 8 --Lsdim 4 --eig-n-conv 24 --eig-n-ev 24 --eig-n-kr 128
     --eig-tol ${tol} --eig-max-restarts 1000
-    --matpc even-even --enable-testing true 
+    --matpc even-even --enable-testing true
     --gtest_output=xml:eigensolve_test_mobius_sym.xml)
 
   add_test(NAME eigensolve_test_mobius_asym
     COMMAND ${QUDA_CTEST_LAUNCH} $<TARGET_FILE:eigensolve_test> ${MPIEXEC_POSTFLAGS}
-    --dslash-type mobius --prec ${prec}
+    --dslash-type mobius
     --dim 2 4 6 8 --Lsdim 4 --eig-n-conv 24 --eig-n-ev 24 --eig-n-kr 128
     --eig-tol ${tol} --eig-max-restarts 1000
-    --matpc even-even-asym --enable-testing true 
+    --matpc even-even-asym --enable-testing true
     --gtest_output=xml:eigensolve_test_mobius_asym.xml)
 
   add_test(NAME eigensolve_test_mobius_eofa_sym
     COMMAND ${QUDA_CTEST_LAUNCH} $<TARGET_FILE:eigensolve_test> ${MPIEXEC_POSTFLAGS}
-    --dslash-type mobius-eofa --prec ${prec}
+    --dslash-type mobius-eofa
     --dim 2 4 6 8 --Lsdim 4 --eig-n-conv 24 --eig-n-ev 24 --eig-n-kr 128
     --eig-tol ${tol} --eig-max-restarts 1000
-    --matpc even-even --enable-testing true 
+    --matpc even-even --enable-testing true
     --gtest_output=xml:eigensolve_test_mobius_eofa_sym.xml)
 
   add_test(NAME eigensolve_test_mobius_eofa_asym
     COMMAND ${QUDA_CTEST_LAUNCH} $<TARGET_FILE:eigensolve_test> ${MPIEXEC_POSTFLAGS}
-    --dslash-type mobius-eofa --prec ${prec}
+    --dslash-type mobius-eofa
     --dim 2 4 6 8 --Lsdim 4 --eig-n-conv 24 --eig-n-ev 24 --eig-n-kr 128
     --eig-tol ${tol} --eig-max-restarts 1000
-    --matpc even-even-asym --enable-testing true 
+    --matpc even-even-asym --enable-testing true
     --gtest_output=xml:eigensolve_test_mobius_eofa_asym.xml)
 endif()
 
diff --git a/tests/blas_interface_test_gtest.hpp b/tests/blas_interface_test_gtest.hpp
index cc6421306a..3ba10e1101 100644
--- a/tests/blas_interface_test_gtest.hpp
+++ b/tests/blas_interface_test_gtest.hpp
@@ -71,7 +71,7 @@ TEST_P(BLASTest, verify)
   switch (test_type) {
   case QUDA_BLAS_GEMM: {
     auto deviation_gemm = gemm_test(param);
-    decltype(deviation_gemm) tol_gemm;
+    decltype(deviation_gemm) tol_gemm = 0.0; // initialize to suppress warning
     switch (data_type) {
     case QUDA_BLAS_DATATYPE_S:
     case QUDA_BLAS_DATATYPE_C: tol_gemm = 10 * std::numeric_limits<float>::epsilon(); break;
@@ -84,7 +84,7 @@ TEST_P(BLASTest, verify)
   }
   case QUDA_BLAS_LU_INV: {
     auto deviation_lu_inv = lu_inv_test(param);
-    decltype(deviation_lu_inv) tol_lu_inv;
+    decltype(deviation_lu_inv) tol_lu_inv = 0.0; // initialize to suppress warning
     // We allow a factor of 5000 (500x more than the gemm tolerance factor)
     // due to variations in algorithmic implementation, order of arithmetic
     // operations, and possible near singular eigenvalues or degeneracies.
diff --git a/tests/utils/host_utils.h b/tests/utils/host_utils.h
index 24a8668e7d..d001fd6eea 100644
--- a/tests/utils/host_utils.h
+++ b/tests/utils/host_utils.h
@@ -43,7 +43,7 @@ extern QudaPrecision &cuda_prec_ritz;
 // Determine if the Laplace operator has been defined
 constexpr bool is_enabled_laplace()
 {
-#ifdef QUDA_LAPLACE
+#ifdef QUDA_DIRAC_LAPLACE
   return true;
 #else
   return false;