diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 0d854ebd192..9dcdd29eb14 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -4,7 +4,7 @@ if(BUILD_TESTING)
   file(GLOB transparent_upgrade_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" upgrade*.cc)
 
   file(GLOB tdb_dontrun_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" bdb-simple-deadlock*.cc)
-  string(REGEX REPLACE "\\.cc?(;|$)" "\\1" tdb_dontrun_tests "${tdb_dontrun_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" "\\1" tdb_dontrun_tests "${tdb_dontrun_srcs}")
 
   file(GLOB srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.cc)
   list(REMOVE_ITEM srcs ${transparent_upgrade_srcs})
@@ -13,16 +13,16 @@ if(BUILD_TESTING)
   file(GLOB abortrecover_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" recover-*.cc)
   file(GLOB loader_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" loader-*.cc)
   file(GLOB stress_test_srcs RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" test_stress*.cc)
-  string(REGEX REPLACE "\\.cc?(;|$)" ".recover\\1" recover_tests "${recover_srcs}")
-  string(REGEX REPLACE "\\.cc?(;|$)" ".abortrecover\\1" abortrecover_tests "${abortrecover_srcs}")
-  string(REGEX REPLACE "\\.cc?(;|$)" ".loader\\1" loader_tests "${loader_srcs}")
-  string(REGEX REPLACE "\\.cc?(;|$)" ".tdb\\1" stress_tests "${stress_test_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" ".recover\\1" recover_tests "${recover_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" ".abortrecover\\1" abortrecover_tests "${abortrecover_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" ".loader\\1" loader_tests "${loader_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" stress_tests "${stress_test_srcs}")
 
   set(tdb_srcs ${srcs})
   list(REMOVE_ITEM tdb_srcs ${tdb_dontrun_srcs})
-  string(REGEX REPLACE "\\.cc?(;|$)" ".tdb\\1" tdb_bins "${tdb_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" tdb_bins "${tdb_srcs}")
   list(REMOVE_ITEM tdb_srcs ${abortrecover_srcs} ${loader_srcs})
-  string(REGEX REPLACE "\\.cc?(;|$)" ".tdb\\1" tdb_tests "${tdb_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" tdb_tests "${tdb_srcs}")
 
   if(BDB_FOUND)
     set(bdb_dontrun_srcs
@@ -304,7 +304,7 @@ if(BUILD_TESTING)
     set(bdb_srcs ${srcs})
     string(REGEX REPLACE "\\.cc(;|$)" "\\1" bdb_testbases "${bdb_srcs}")
     list(REMOVE_ITEM bdb_testbases ${bdb_dontrun_srcs})
-    string(REGEX REPLACE "(;|$)" ".bdb\\1" bdb_tests "${bdb_testbases}")
+    string(REGEX REPLACE "(.)(;|$)" "\\1.bdb\\2" bdb_tests "${bdb_testbases}")
     set(bdb_bins ${bdb_tests})
   endif()
 
@@ -392,7 +392,7 @@ if(BUILD_TESTING)
     add_dependencies(test1426.tdb tokudb_dump)
   endif()
 
-  string(REGEX REPLACE "\\.cc?(;|$)" ".tdb\\1" recover_would_be_tdb_tests "${recover_srcs}")
+  string(REGEX REPLACE "\\.cc(;|$)" ".tdb\\1" recover_would_be_tdb_tests "${recover_srcs}")
   declare_custom_tests(${recover_would_be_tdb_tests})
 
   declare_custom_tests(powerfail.tdb)