diff --git a/Modules/GoogleTest/DiscoverTests.cmake b/Modules/GoogleTest/DiscoverTests.cmake
index 2d86422f36..64073e5420 100644
--- a/Modules/GoogleTest/DiscoverTests.cmake
+++ b/Modules/GoogleTest/DiscoverTests.cmake
@@ -53,10 +53,13 @@ macro(write_test_line)
     string(REGEX REPLACE "^DISABLED_" "" pretty_test_name "${pretty_test_name}")
   endif()
 
-  if(NOT current_test_value_param STREQUAL "" AND NOT NO_PRETTY_VALUES)
-    # Remove value param name, if any, from test name
-    string(REGEX REPLACE "^(.+)/.+$" "\\1" pretty_test_name "${pretty_test_name}")
-    set(pretty_test_name "${pretty_test_name}/${current_test_value_param}")
+  if (NOT current_test_value_param STREQUAL "" AND NOT NO_PRETTY_VALUES)
+    # If the test name contains a value parameter name (part of the string after last slash), and this
+    # name is an integer which indicates that it's the default name generated by googletest, replace it by
+    # the value parameter name provided separately
+    if("${pretty_test_name}" MATCHES "^(.*)/[0-9]+$")
+      set(pretty_test_name "${CMAKE_MATCH_1}/${current_test_value_param}")
+    endif()
   endif()
 
   if(NOT current_test_type_param STREQUAL "")
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake
index 554b00fd58..e73800fb47 100644
--- a/Modules/GoogleTestAddTests.cmake
+++ b/Modules/GoogleTestAddTests.cmake
@@ -20,9 +20,12 @@ macro(write_test_to_file)
   endif()
 
   if (NOT current_test_value_param STREQUAL "" AND NOT arg_NO_PRETTY_VALUES)
-    # Remove value param name, if any, from test name
-    string(REGEX REPLACE "^(.+)/.+$" "\\1" pretty_test_name "${pretty_test_name}")
-    set(pretty_test_name "${pretty_test_name}/${current_test_value_param}")
+    # If the test name contains a value parameter name (part of the string after last slash), and this
+    # name is an integer which indicates that it's the default name generated by googletest, replace it by
+    # the value parameter name provided separately
+    if("${pretty_test_name}" MATCHES "^(.*)/[0-9]+$")
+      set(pretty_test_name "${CMAKE_MATCH_1}/${current_test_value_param}")
+    endif()
   endif()
 
   if(NOT current_test_type_param STREQUAL "")
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt
index a658586841..bcfee684fe 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt
@@ -11,13 +11,13 @@ Test project .*/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change
   Test +#[0-9]+: prefix/typed\.case<float>
   Test +#[0-9]+: prefix/typed\.case<char>
   Test +#[0-9]+: prefix/typed\.case<int>
-  Test +#[0-9]+: both_suite\.test/VALUE<TYPE>
-  Test +#[0-9]+: both_suite\.case/VALUE<TYPE>
-  Test +#[0-9]+: both\.test/VALUE<TYPE>
-  Test +#[0-9]+: both\.case/VALUE<TYPE>
-  Test +#[0-9]+: ns\.both\.test/VALUE<TYPE>
-  Test +#[0-9]+: ns\.both\.case/VALUE<TYPE>
-  Test +#[0-9]+: prefix/both\.test/VALUE<TYPE>
-  Test +#[0-9]+: prefix/both\.case/VALUE<TYPE>
+  Test +#[0-9]+: both_suite\.test<TYPE>
+  Test +#[0-9]+: both_suite\.case/test<TYPE>
+  Test +#[0-9]+: both\.test<TYPE>
+  Test +#[0-9]+: both\.case/test<TYPE>
+  Test +#[0-9]+: ns\.both\.test<TYPE>
+  Test +#[0-9]+: ns\.both\.case/test<TYPE>
+  Test +#[0-9]+: prefix/both\.test<TYPE>
+  Test +#[0-9]+: prefix/both\.case/test<TYPE>
 
 Total Tests: [0-9]+
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt
index 840c41060b..dd7ef7a420 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt
@@ -47,20 +47,20 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/1!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:value/test\.case/"foo"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/"foo"!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:value/test\.case/'c'!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/'c'!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:value/test\.case/named!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/named!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/1!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/1!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/"foo"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/"foo"!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.value/test\.case/'c'!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/'c'!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.value/test\.case/named!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/named!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/1!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/1!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/"foo"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/"foo"!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/value/test\.case/'c'!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/'c'!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/value/test\.case/named!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/named!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"semicolon;"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:param/special\.case/"semicolon;"!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"backslash\\"!1
@@ -109,22 +109,22 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"__csb___text"!1 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.test/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.case/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.case/test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/test<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/test<TYPE>!1 .+ +Passed +[0-9\.]+ sec
 
 100% tests passed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt
index b2cd8ada42..7dcac80e3e 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt
@@ -47,20 +47,20 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/1!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:value/test\.case/"foo"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/"foo"!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:value/test\.case/'c'!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/'c'!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:value/test\.case/named!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/named!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/1!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/1!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/"foo"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/"foo"!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.value/test\.case/'c'!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/'c'!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.value/test\.case/named!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/named!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/1!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/1!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/"foo"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/"foo"!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/value/test\.case/'c'!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/'c'!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/value/test\.case/named!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/named!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"semicolon;"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:param/special\.case/"semicolon;"!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"backslash\\"!2
@@ -109,22 +109,22 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"__csb___text"!2 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.test/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.case/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.case/test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/test<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/test<TYPE>!2 .+ +Passed +[0-9\.]+ sec
 
 100% tests passed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt
index 9aaad21b38..08df7aa85d 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt
@@ -23,22 +23,22 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<char>!4 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<int>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<int>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.test/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.case/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.case/test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/test<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/test<TYPE>!4 .+ +Passed +[0-9\.]+ sec
 
 100% tests passed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt
index 08ec086424..ed7eec330d 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt
@@ -23,22 +23,22 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<42>!6 .+ +Passed +[0-9\.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<named>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<named>!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.test/VALUE!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both_suite\.case/VALUE!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.test/VALUE<suite>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<suite>!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:both\.case/VALUE<suite>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<suite>!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.test/VALUE<suite>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<suite>!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:ns\.both\.case/VALUE<suite>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<suite>!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.test/VALUE<suite>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<suite>!6 .+ +Passed +[0-9\.]+ sec
- *Start +[0-9]+: TEST:prefix/both\.case/VALUE<suite>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<suite>!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/test!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/test!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.test<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test<suite>!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:both\.case/test<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/test<suite>!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test<suite>!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/test<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/test<suite>!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test<suite>!6 .+ +Passed +[0-9\.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/test<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/test<suite>!6 .+ +Passed +[0-9\.]+ sec
 
 100% tests passed out of [0-9]+