diff --git a/extras/CatchAddTests.cmake b/extras/CatchAddTests.cmake
index 2fd92a1e72..6ec62fa1cc 100644
--- a/extras/CatchAddTests.cmake
+++ b/extras/CatchAddTests.cmake
@@ -132,7 +132,7 @@ function(catch_discover_tests_impl)
     endforeach(char)
     # ...add output dir
     if(output_dir)
-      string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean ${test_name})
+      string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean "${test_name}")
       set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
     endif()
 
@@ -150,8 +150,7 @@ function(catch_discover_tests_impl)
       "${prefix}${test}${suffix}"
       PROPERTIES
       WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-      ${properties}
-    )
+      ${properties})
 
     if(environment_modifications)
       add_command(set_tests_properties