diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp
index 94f552237a..2a24de699b 100644
--- a/src/catch2/catch_all.hpp
+++ b/src/catch2/catch_all.hpp
@@ -109,6 +109,7 @@
 #include <catch2/internal/catch_test_spec_parser.hpp>
 #include <catch2/internal/catch_textflow.hpp>
 #include <catch2/internal/catch_to_string.hpp>
+#include <catch2/internal/catch_type_to_string.hpp>
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
diff --git a/src/catch2/internal/catch_compiler_capabilities.hpp b/src/catch2/internal/catch_compiler_capabilities.hpp
index 9ffae59629..5a00d49644 100644
--- a/src/catch2/internal/catch_compiler_capabilities.hpp
+++ b/src/catch2/internal/catch_compiler_capabilities.hpp
@@ -58,6 +58,7 @@
 
 #    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
 
+#    define CATCH_INTERNAL_TYPEID_DEMANGLE
 #endif
 
 #if defined(__CUDACC__) && !defined(__clang__)
@@ -73,6 +74,7 @@
 #    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
 #    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
 
+#    define CATCH_INTERNAL_TYPEID_DEMANGLE
 #endif // __clang__ && !_MSC_VER
 
 #if defined(__clang__)
diff --git a/src/catch2/internal/catch_template_test_registry.hpp b/src/catch2/internal/catch_template_test_registry.hpp
index bfac3bc81d..61b5e056a0 100644
--- a/src/catch2/internal/catch_template_test_registry.hpp
+++ b/src/catch2/internal/catch_template_test_registry.hpp
@@ -13,6 +13,7 @@
 #include <catch2/internal/catch_preprocessor.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
+#include <catch2/internal/catch_type_to_string.hpp>
 
 
 // GCC 5 and older do not properly handle disabling unused-variable warning
@@ -178,7 +179,7 @@
             void reg_tests() {                                          \
                 size_t index = 0;                                    \
                 using expander = size_t[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index) + " - " + Catch::type_to_string<Types>(), Tags } ), index++)... };/* NOLINT */\
             }                                                     \
         };\
         static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
diff --git a/src/catch2/internal/catch_type_to_string.hpp b/src/catch2/internal/catch_type_to_string.hpp
new file mode 100644
index 0000000000..c5f99009f6
--- /dev/null
+++ b/src/catch2/internal/catch_type_to_string.hpp
@@ -0,0 +1,33 @@
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE_1_0.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+#ifndef CATCH_TYPE_TO_STRING_HPP_INCLUDED
+#define CATCH_TYPE_TO_STRING_HPP_INCLUDED
+
+#include <typeinfo>
+
+#if defined( CATCH_INTERNAL_TYPEID_DEMANGLE )
+#    include <memory>
+#    include <cxxabi.h>
+#endif
+
+namespace Catch {
+    template <typename T> std::string type_to_string() {
+#if defined( CATCH_INTERNAL_TYPEID_DEMANGLE )
+        const char* name = typeid( T ).name();
+        int status = 0;
+        std::unique_ptr<char, void ( * )( void* )> res{
+            abi::__cxa_demangle( name, NULL, NULL, &status ), std::free };
+
+        return status == 0 ? res.get() : name;
+#else
+        return typeid( T ).name();
+#endif
+    }
+} // end namespace Catch
+
+#endif // CATCH_TYPE_TO_STRING_HPP_INCLUDED
diff --git a/tests/SelfTest/Baselines/automake.sw.approved.txt b/tests/SelfTest/Baselines/automake.sw.approved.txt
index b8b5956601..12513cc5f7 100644
--- a/tests/SelfTest/Baselines/automake.sw.approved.txt
+++ b/tests/SelfTest/Baselines/automake.sw.approved.txt
@@ -240,13 +240,13 @@ Message from section two
 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 0
 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 1
 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 2
-:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0
-:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1
-:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0
-:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1
-:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0
-:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1
-:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2
+:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType
+:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float
+:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType
+:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float
+:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0 - int
+:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1 - char
+:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2 - float
 :test-result: PASS TemplateTest: vectors can be sized and resized - float
 :test-result: PASS TemplateTest: vectors can be sized and resized - int
 :test-result: PASS TemplateTest: vectors can be sized and resized - std::string
diff --git a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
index 2afd308bc4..a3c7f1d7c7 100644
--- a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
@@ -233,13 +233,13 @@
 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 0
 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 1
 :test-result: PASS Template test case method with test types specified inside std::tuple - MyTypes - 2
-:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0
-:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1
-:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0
-:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1
-:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0
-:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1
-:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2
+:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType
+:test-result: PASS Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float
+:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType
+:test-result: PASS Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float
+:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 0 - int
+:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 1 - char
+:test-result: PASS Template test case with test types specified inside std::tuple - MyTypes - 2 - float
 :test-result: PASS TemplateTest: vectors can be sized and resized - float
 :test-result: PASS TemplateTest: vectors can be sized and resized - int
 :test-result: PASS TemplateTest: vectors can be sized and resized - std::string
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index 63dd231e89..9ae8346fe3 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -12056,7 +12056,8 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-copyable and non-
-movable std::tuple - NonCopyableAndNonMovableTypes - 0
+movable std::tuple - NonCopyableAndNonMovableTypes - 0 -
+NonCopyableAndNonMovableType
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12068,7 +12069,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-copyable and non-
-movable std::tuple - NonCopyableAndNonMovableTypes - 1
+movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12080,7 +12081,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-default-constructible
-std::tuple - MyNonDefaultConstructibleTypes - 0
+std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12092,7 +12093,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-default-constructible
-std::tuple - MyNonDefaultConstructibleTypes - 1
+std::tuple - MyNonDefaultConstructibleTypes - 1 - float
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12103,7 +12104,8 @@ with expansion:
   4 > 0
 
 -------------------------------------------------------------------------------
-Template test case with test types specified inside std::tuple - MyTypes - 0
+Template test case with test types specified inside std::tuple - MyTypes - 0 -
+int
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12114,7 +12116,8 @@ with expansion:
   4 > 0
 
 -------------------------------------------------------------------------------
-Template test case with test types specified inside std::tuple - MyTypes - 1
+Template test case with test types specified inside std::tuple - MyTypes - 1 -
+char
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12125,7 +12128,8 @@ with expansion:
   1 > 0
 
 -------------------------------------------------------------------------------
-Template test case with test types specified inside std::tuple - MyTypes - 2
+Template test case with test types specified inside std::tuple - MyTypes - 2 -
+float
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index 9cba323d9b..380281608d 100644
--- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -12049,7 +12049,8 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-copyable and non-
-movable std::tuple - NonCopyableAndNonMovableTypes - 0
+movable std::tuple - NonCopyableAndNonMovableTypes - 0 -
+NonCopyableAndNonMovableType
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12061,7 +12062,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-copyable and non-
-movable std::tuple - NonCopyableAndNonMovableTypes - 1
+movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12073,7 +12074,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-default-constructible
-std::tuple - MyNonDefaultConstructibleTypes - 0
+std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12085,7 +12086,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Template test case with test types specified inside non-default-constructible
-std::tuple - MyNonDefaultConstructibleTypes - 1
+std::tuple - MyNonDefaultConstructibleTypes - 1 - float
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12096,7 +12097,8 @@ with expansion:
   4 > 0
 
 -------------------------------------------------------------------------------
-Template test case with test types specified inside std::tuple - MyTypes - 0
+Template test case with test types specified inside std::tuple - MyTypes - 0 -
+int
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12107,7 +12109,8 @@ with expansion:
   4 > 0
 
 -------------------------------------------------------------------------------
-Template test case with test types specified inside std::tuple - MyTypes - 1
+Template test case with test types specified inside std::tuple - MyTypes - 1 -
+char
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
@@ -12118,7 +12121,8 @@ with expansion:
   1 > 0
 
 -------------------------------------------------------------------------------
-Template test case with test types specified inside std::tuple - MyTypes - 2
+Template test case with test types specified inside std::tuple - MyTypes - 2 -
+float
 -------------------------------------------------------------------------------
 Misc.tests.cpp:<line number>
 ...............................................................................
diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt
index f7411501da..e0a0d6b312 100644
--- a/tests/SelfTest/Baselines/junit.sw.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -1301,13 +1301,13 @@ Misc.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 0" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 2" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 0" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 1" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 2" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 0 - int" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 1 - char" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 2 - float" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="TemplateTest: vectors can be sized and resized - float" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="TemplateTest: vectors can be sized and resized - float/resizing bigger changes size and capacity" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="TemplateTest: vectors can be sized and resized - float/resizing smaller changes size but not capacity" time="{duration}" status="run"/>
diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
index aa0860a3c9..150f7841c8 100644
--- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
@@ -1300,13 +1300,13 @@ Misc.tests.cpp:<line number>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 0" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.Template_Fixture" name="Template test case method with test types specified inside std::tuple - MyTypes - 2" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 0" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 1" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 2" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 0 - int" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 1 - char" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Template test case with test types specified inside std::tuple - MyTypes - 2 - float" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="TemplateTest: vectors can be sized and resized - float" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="TemplateTest: vectors can be sized and resized - float/resizing bigger changes size and capacity" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="TemplateTest: vectors can be sized and resized - float/resizing smaller changes size but not capacity" time="{duration}" status="run"/>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
index a9319a6280..f4ff2c0b96 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -1653,13 +1653,13 @@ with expansion:
 Misc.tests.cpp:<line number>
       </failure>
     </testCase>
-    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 0" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 1" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 2" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 0 - int" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 1 - char" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 2 - float" duration="{duration}"/>
     <testCase name="TemplateTest: vectors can be sized and resized - float" duration="{duration}"/>
     <testCase name="TemplateTest: vectors can be sized and resized - float/resizing bigger changes size and capacity" duration="{duration}"/>
     <testCase name="TemplateTest: vectors can be sized and resized - float/resizing smaller changes size but not capacity" duration="{duration}"/>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
index 97b2d98817..dfa10d57ef 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
@@ -1652,13 +1652,13 @@ with expansion:
 Misc.tests.cpp:<line number>
       </failure>
     </testCase>
-    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 0" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 1" duration="{duration}"/>
-    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 2" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 0 - int" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 1 - char" duration="{duration}"/>
+    <testCase name="Template test case with test types specified inside std::tuple - MyTypes - 2 - float" duration="{duration}"/>
     <testCase name="TemplateTest: vectors can be sized and resized - float" duration="{duration}"/>
     <testCase name="TemplateTest: vectors can be sized and resized - float/resizing bigger changes size and capacity" duration="{duration}"/>
     <testCase name="TemplateTest: vectors can be sized and resized - float/resizing smaller changes size but not capacity" duration="{duration}"/>
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index 2c7adae54d..b7b96fd8a7 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -3014,19 +3014,19 @@ ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 # Template test case method with test types specified inside std::tuple - MyTypes - 2
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
-# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0
+# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType
 ok {test-number} - sizeof(TestType) > 0 for: 1 > 0
-# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1
+# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
-# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0
+# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType
 ok {test-number} - sizeof(TestType) > 0 for: 1 > 0
-# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1
+# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
-# Template test case with test types specified inside std::tuple - MyTypes - 0
+# Template test case with test types specified inside std::tuple - MyTypes - 0 - int
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
-# Template test case with test types specified inside std::tuple - MyTypes - 1
+# Template test case with test types specified inside std::tuple - MyTypes - 1 - char
 ok {test-number} - sizeof(TestType) > 0 for: 1 > 0
-# Template test case with test types specified inside std::tuple - MyTypes - 2
+# Template test case with test types specified inside std::tuple - MyTypes - 2 - float
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
 # TemplateTest: vectors can be sized and resized - float
 ok {test-number} - v.size() == 5 for: 5 == 5
diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
index d13b493c90..8e18b3f168 100644
--- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
@@ -3007,19 +3007,19 @@ ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1 == 1
 # Template test case method with test types specified inside std::tuple - MyTypes - 2
 ok {test-number} - Template_Fixture<TestType>::m_a == 1 for: 1.0 == 1
-# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0
+# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType
 ok {test-number} - sizeof(TestType) > 0 for: 1 > 0
-# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1
+# Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
-# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0
+# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType
 ok {test-number} - sizeof(TestType) > 0 for: 1 > 0
-# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1
+# Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
-# Template test case with test types specified inside std::tuple - MyTypes - 0
+# Template test case with test types specified inside std::tuple - MyTypes - 0 - int
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
-# Template test case with test types specified inside std::tuple - MyTypes - 1
+# Template test case with test types specified inside std::tuple - MyTypes - 1 - char
 ok {test-number} - sizeof(TestType) > 0 for: 1 > 0
-# Template test case with test types specified inside std::tuple - MyTypes - 2
+# Template test case with test types specified inside std::tuple - MyTypes - 2 - float
 ok {test-number} - sizeof(TestType) > 0 for: 4 > 0
 # TemplateTest: vectors can be sized and resized - float
 ok {test-number} - v.size() == 5 for: 5 == 5
diff --git a/tests/SelfTest/Baselines/teamcity.sw.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.approved.txt
index 526f00a90f..3cdcbab6c5 100644
--- a/tests/SelfTest/Baselines/teamcity.sw.approved.txt
+++ b/tests/SelfTest/Baselines/teamcity.sw.approved.txt
@@ -585,20 +585,20 @@ Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expan
 ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"]
 ##teamcity[testStarted name='Template test case method with test types specified inside std::tuple - MyTypes - 2']
 ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0']
-##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1']
-##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0']
-##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1']
-##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0']
-##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1']
-##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2']
-##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType']
+##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float']
+##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType']
+##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float']
+##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int']
+##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char']
+##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float']
+##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float' duration="{duration}"]
 ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - float']
 ##teamcity[testFinished name='TemplateTest: vectors can be sized and resized - float' duration="{duration}"]
 ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - int']
diff --git a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
index 2b7914464b..705e2f5353 100644
--- a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
@@ -585,20 +585,20 @@ Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expan
 ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"]
 ##teamcity[testStarted name='Template test case method with test types specified inside std::tuple - MyTypes - 2']
 ##teamcity[testFinished name='Template test case method with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0']
-##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1']
-##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0']
-##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1']
-##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0']
-##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1']
-##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1' duration="{duration}"]
-##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2']
-##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType']
+##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float']
+##teamcity[testFinished name='Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType']
+##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float']
+##teamcity[testFinished name='Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int']
+##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 0 - int' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char']
+##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 1 - char' duration="{duration}"]
+##teamcity[testStarted name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float']
+##teamcity[testFinished name='Template test case with test types specified inside std::tuple - MyTypes - 2 - float' duration="{duration}"]
 ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - float']
 ##teamcity[testFinished name='TemplateTest: vectors can be sized and resized - float' duration="{duration}"]
 ##teamcity[testStarted name='TemplateTest: vectors can be sized and resized - int']
diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt
index 0167e59cf2..f8aa75f482 100644
--- a/tests/SelfTest/Baselines/xml.sw.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.approved.txt
@@ -14293,7 +14293,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14304,7 +14304,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14315,7 +14315,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14326,7 +14326,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14337,7 +14337,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 0 - int" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14348,7 +14348,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 1" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 1 - char" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14359,7 +14359,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 2" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 2 - float" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
index 7a88f7de7f..691853d500 100644
--- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
@@ -14293,7 +14293,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0 - NonCopyableAndNonMovableType" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14304,7 +14304,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 1 - float" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14315,7 +14315,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 0 - NonDefaultConstructibleType" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14326,7 +14326,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside non-default-constructible std::tuple - MyNonDefaultConstructibleTypes - 1 - float" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14337,7 +14337,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 0" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 0 - int" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14348,7 +14348,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 1" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 1 - char" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0
@@ -14359,7 +14359,7 @@ Message from section two
     </Expression>
     <OverallResult success="true"/>
   </TestCase>
-  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 2" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
+  <TestCase name="Template test case with test types specified inside std::tuple - MyTypes - 2 - float" tags="[list][template]" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
     <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Misc.tests.cpp" >
       <Original>
         sizeof(TestType) > 0