diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index 9b9bfa8edd..b1f8adf84e 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -979,22 +979,22 @@ Condition.tests.cpp:<line number>: passed: data.str_hello != "goodbye" for: "hel
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hell" for: "hello" != "hell"
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hello1" for: "hello" != "hello1"
 Condition.tests.cpp:<line number>: passed: data.str_hello.size() != 6 for: 5 != 6
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-)json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+)" for: "
 "
 ==
 "
 "
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -1005,7 +1005,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     1,
     2
   ]
-})json" for: "
+})" for: "
 {
   "int": 1,
   "double": 1.5,
@@ -1030,14 +1030,14 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     2
   ]
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" for: "
+})" for: "
 {
   "empty_object": {
   },
@@ -1054,16 +1054,16 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "key": 1
   }
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
   1,
   1.5,
@@ -1077,7 +1077,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "array",
     42.5
   ]
-])json" for: "
+])" for: "
 [
   1,
   1.5,
@@ -1108,26 +1108,26 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     42.5
   ]
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-"custom")json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+"custom")" for: "
 "custom""
 ==
 "
diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
index 816b4083a9..61479afb7e 100644
--- a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -977,22 +977,22 @@ Condition.tests.cpp:<line number>: passed: data.str_hello != "goodbye" for: "hel
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hell" for: "hello" != "hell"
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hello1" for: "hello" != "hello1"
 Condition.tests.cpp:<line number>: passed: data.str_hello.size() != 6 for: 5 != 6
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-)json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+)" for: "
 "
 ==
 "
 "
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -1003,7 +1003,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     1,
     2
   ]
-})json" for: "
+})" for: "
 {
   "int": 1,
   "double": 1.5,
@@ -1028,14 +1028,14 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     2
   ]
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" for: "
+})" for: "
 {
   "empty_object": {
   },
@@ -1052,16 +1052,16 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "key": 1
   }
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
   1,
   1.5,
@@ -1075,7 +1075,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "array",
     42.5
   ]
-])json" for: "
+])" for: "
 [
   1,
   1.5,
@@ -1106,26 +1106,26 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     42.5
   ]
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-"custom")json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+"custom")" for: "
 "custom""
 ==
 "
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index 08b9ace7db..175d87863b 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -7266,8 +7266,8 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
-)json" )
+  REQUIRE( stream.str() == R"(
+)" )
 with expansion:
   "
   "
@@ -7283,9 +7283,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7303,7 +7303,7 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -7314,7 +7314,7 @@ Json.tests.cpp:<line number>: PASSED:
     1,
     2
   ]
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7350,14 +7350,14 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7385,9 +7385,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7405,7 +7405,7 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
   1,
   1.5,
@@ -7419,7 +7419,7 @@ Json.tests.cpp:<line number>: PASSED:
     "array",
     42.5
   ]
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7461,9 +7461,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7481,9 +7481,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7501,8 +7501,8 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
-"custom")json" )
+  REQUIRE( stream.str() == R"(
+"custom")" )
 with expansion:
   "
   "custom""
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index 252a78dcdb..0ff6225999 100644
--- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -7264,8 +7264,8 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
-)json" )
+  REQUIRE( stream.str() == R"(
+)" )
 with expansion:
   "
   "
@@ -7281,9 +7281,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7301,7 +7301,7 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -7312,7 +7312,7 @@ Json.tests.cpp:<line number>: PASSED:
     1,
     2
   ]
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7348,14 +7348,14 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7383,9 +7383,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7403,7 +7403,7 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
   1,
   1.5,
@@ -7417,7 +7417,7 @@ Json.tests.cpp:<line number>: PASSED:
     "array",
     42.5
   ]
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7459,9 +7459,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7479,9 +7479,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7499,8 +7499,8 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
-"custom")json" )
+  REQUIRE( stream.str() == R"(
+"custom")" )
 with expansion:
   "
   "custom""
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index d18bade6d3..e09759bdf2 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -1867,14 +1867,14 @@ ok {test-number} - data.str_hello != "hello1" for: "hello" != "hello1"
 # Inequality checks that should succeed
 ok {test-number} - data.str_hello.size() != 6 for: 5 != 6
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
-)json" for: " " == " "
+ok {test-number} - stream.str() == R"(
+)" for: " " == " "
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
-})json" for: " { }" == " { }"
+})" for: " { }" == " { }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -1885,22 +1885,22 @@ ok {test-number} - stream.str() == R"json(
     1,
     2
   ]
-})json" for: " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }" == " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }"
+})" for: " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }" == " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" for: " {   "empty_object": {   },   "fully_object": {     "key": 1   } }" == " {   "empty_object": {   },   "fully_object": {     "key": 1   } }"
+})" for: " {   "empty_object": {   },   "fully_object": {     "key": 1   } }" == " {   "empty_object": {   },   "fully_object": {     "key": 1   } }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 [
-])json" for: " [ ]" == " [ ]"
+])" for: " [ ]" == " [ ]"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 [
   1,
   1.5,
@@ -1914,18 +1914,18 @@ ok {test-number} - stream.str() == R"json(
     "array",
     42.5
   ]
-])json" for: " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]" == " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]"
+])" for: " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]" == " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
-})json" for: " { }" == " { }"
+})" for: " { }" == " { }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 [
-])json" for: " [ ]" == " [ ]"
+])" for: " [ ]" == " [ ]"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
-"custom")json" for: " "custom"" == " "custom""
+ok {test-number} - stream.str() == R"(
+"custom")" for: " "custom"" == " "custom""
 # JsonWriter
 ok {test-number} - stream.str() == "\n\"\\\"\"" for: " "\""" == " "\"""
 # Lambdas in assertions
diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
index 6d4ccaf2df..f3694a82be 100644
--- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
@@ -1865,14 +1865,14 @@ ok {test-number} - data.str_hello != "hello1" for: "hello" != "hello1"
 # Inequality checks that should succeed
 ok {test-number} - data.str_hello.size() != 6 for: 5 != 6
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
-)json" for: " " == " "
+ok {test-number} - stream.str() == R"(
+)" for: " " == " "
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
-})json" for: " { }" == " { }"
+})" for: " { }" == " { }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -1883,22 +1883,22 @@ ok {test-number} - stream.str() == R"json(
     1,
     2
   ]
-})json" for: " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }" == " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }"
+})" for: " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }" == " {   "int": 1,   "double": 1.5,   "true": true,   "false": false,   "string": "this is a string",   "array": [     1,     2   ] }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" for: " {   "empty_object": {   },   "fully_object": {     "key": 1   } }" == " {   "empty_object": {   },   "fully_object": {     "key": 1   } }"
+})" for: " {   "empty_object": {   },   "fully_object": {     "key": 1   } }" == " {   "empty_object": {   },   "fully_object": {     "key": 1   } }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 [
-])json" for: " [ ]" == " [ ]"
+])" for: " [ ]" == " [ ]"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 [
   1,
   1.5,
@@ -1912,18 +1912,18 @@ ok {test-number} - stream.str() == R"json(
     "array",
     42.5
   ]
-])json" for: " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]" == " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]"
+])" for: " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]" == " [   1,   1.5,   true,   false,   "this is a string",   {     "object": 42   },   [     "array",     42.5   ] ]"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 {
-})json" for: " { }" == " { }"
+})" for: " { }" == " { }"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
+ok {test-number} - stream.str() == R"(
 [
-])json" for: " [ ]" == " [ ]"
+])" for: " [ ]" == " [ ]"
 # JsonWriter
-ok {test-number} - stream.str() == R"json(
-"custom")json" for: " "custom"" == " "custom""
+ok {test-number} - stream.str() == R"(
+"custom")" for: " "custom"" == " "custom""
 # JsonWriter
 ok {test-number} - stream.str() == "\n\"\\\"\"" for: " "\""" == " "\"""
 # Lambdas in assertions
diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt
index db87c7222f..ccca4886af 100644
--- a/tests/SelfTest/Baselines/xml.sw.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.approved.txt
@@ -8783,8 +8783,8 @@ C
     <Section name="Newly constructed JsonWriter does nothing" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
-)json"
+          stream.str() == R"(
+)"
         </Original>
         <Expanded>
           "
@@ -8799,9 +8799,9 @@ C
     <Section name="Calling writeObject will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8818,7 +8818,7 @@ C
     <Section name="Calling writeObject with key will create an object to write the value" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -8829,7 +8829,7 @@ C
     1,
     2
   ]
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8864,14 +8864,14 @@ C
     <Section name="nesting objects" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8898,9 +8898,9 @@ C
     <Section name="Calling writeArray will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 [
-])json"
+])"
         </Original>
         <Expanded>
           "
@@ -8917,7 +8917,7 @@ C
     <Section name="Calling writeArray creates array to write the values to" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 [
   1,
   1.5,
@@ -8931,7 +8931,7 @@ C
     "array",
     42.5
   ]
-])json"
+])"
         </Original>
         <Expanded>
           "
@@ -8972,9 +8972,9 @@ C
     <Section name="Moved from JsonObjectWriter shall not insert superfluous brace" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8991,9 +8991,9 @@ C
     <Section name="Moved from JsonArrayWriter shall not insert superfluous bracket" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 [
-])json"
+])"
         </Original>
         <Expanded>
           "
@@ -9010,8 +9010,8 @@ C
     <Section name="Custom class shall be quoted" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
-"custom")json"
+          stream.str() == R"(
+"custom")"
         </Original>
         <Expanded>
           "
diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
index a13d744f67..acc6b85300 100644
--- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
@@ -8783,8 +8783,8 @@ C
     <Section name="Newly constructed JsonWriter does nothing" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
-)json"
+          stream.str() == R"(
+)"
         </Original>
         <Expanded>
           "
@@ -8799,9 +8799,9 @@ C
     <Section name="Calling writeObject will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8818,7 +8818,7 @@ C
     <Section name="Calling writeObject with key will create an object to write the value" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -8829,7 +8829,7 @@ C
     1,
     2
   ]
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8864,14 +8864,14 @@ C
     <Section name="nesting objects" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8898,9 +8898,9 @@ C
     <Section name="Calling writeArray will create an empty pair of braces" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 [
-])json"
+])"
         </Original>
         <Expanded>
           "
@@ -8917,7 +8917,7 @@ C
     <Section name="Calling writeArray creates array to write the values to" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 [
   1,
   1.5,
@@ -8931,7 +8931,7 @@ C
     "array",
     42.5
   ]
-])json"
+])"
         </Original>
         <Expanded>
           "
@@ -8972,9 +8972,9 @@ C
     <Section name="Moved from JsonObjectWriter shall not insert superfluous brace" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 {
-})json"
+})"
         </Original>
         <Expanded>
           "
@@ -8991,9 +8991,9 @@ C
     <Section name="Moved from JsonArrayWriter shall not insert superfluous bracket" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
+          stream.str() == R"(
 [
-])json"
+])"
         </Original>
         <Expanded>
           "
@@ -9010,8 +9010,8 @@ C
     <Section name="Custom class shall be quoted" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/Json.tests.cpp" >
         <Original>
-          stream.str() == R"json(
-"custom")json"
+          stream.str() == R"(
+"custom")"
         </Original>
         <Expanded>
           "
diff --git a/tests/SelfTest/IntrospectiveTests/Json.tests.cpp b/tests/SelfTest/IntrospectiveTests/Json.tests.cpp
index 2973c8bab2..a0860a60b0 100644
--- a/tests/SelfTest/IntrospectiveTests/Json.tests.cpp
+++ b/tests/SelfTest/IntrospectiveTests/Json.tests.cpp
@@ -24,15 +24,15 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
     stream << "\n"; // Make the expected json nicer to look at
     SECTION( "Newly constructed JsonWriter does nothing" ) {
         Catch::JsonValueWriter writer{ stream };
-        REQUIRE( stream.str() == R"json(
-)json" );
+        REQUIRE( stream.str() == R"(
+)" );
     }
 
     SECTION( "Calling writeObject will create an empty pair of braces" ) {
         { auto writer = Catch::JsonValueWriter{ stream }.writeObject(); }
-        REQUIRE( stream.str() == R"json(
+        REQUIRE( stream.str() == R"(
 {
-})json" );
+})" );
     }
 
     SECTION( "Calling writeObject with key will create an object to write the "
@@ -46,7 +46,7 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
             writer.write( "string" ).write( "this is a string" );
             writer.write( "array" ).writeArray().write( 1 ).write( 2 );
         }
-        REQUIRE( stream.str() == R"json(
+        REQUIRE( stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -57,7 +57,7 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
     1,
     2
   ]
-})json" );
+})" );
     }
 
     SECTION( "nesting objects" ) {
@@ -69,21 +69,21 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
                 .write( "key" )
                 .write( 1 );
         }
-        REQUIRE( stream.str() == R"json(
+        REQUIRE( stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" );
+})" );
     }
 
     SECTION( "Calling writeArray will create an empty pair of braces" ) {
         { auto writer = Catch::JsonValueWriter{ stream }.writeArray(); }
-        REQUIRE( stream.str() == R"json(
+        REQUIRE( stream.str() == R"(
 [
-])json" );
+])" );
     }
 
     SECTION( "Calling writeArray creates array to write the values to" ) {
@@ -97,7 +97,7 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
             writer.writeObject().write( "object" ).write( 42 );
             writer.writeArray().write( "array" ).write( 42.5 );
         }
-        REQUIRE( stream.str() == R"json(
+        REQUIRE( stream.str() == R"(
 [
   1,
   1.5,
@@ -111,7 +111,7 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
     "array",
     42.5
   ]
-])json" );
+])" );
     }
 
     SECTION(
@@ -120,9 +120,9 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
             auto writer = Catch::JsonObjectWriter{ stream };
             auto another_writer = std::move( writer );
         }
-        REQUIRE( stream.str() == R"json(
+        REQUIRE( stream.str() == R"(
 {
-})json" );
+})" );
     }
     SECTION(
         "Moved from JsonArrayWriter shall not insert superfluous bracket" ) {
@@ -130,14 +130,14 @@ TEST_CASE( "JsonWriter", "[JSON][JsonWriter]" ) {
             auto writer = Catch::JsonArrayWriter{ stream };
             auto another_writer = std::move( writer );
         }
-        REQUIRE( stream.str() == R"json(
+        REQUIRE( stream.str() == R"(
 [
-])json" );
+])" );
     }
     SECTION( "Custom class shall be quoted" ) {
         Catch::JsonValueWriter{ stream }.write( Custom{} );
-        REQUIRE( stream.str() == R"json(
-"custom")json" );
+        REQUIRE( stream.str() == R"(
+"custom")" );
     }
     SECTION( "String with a quote shall be espaced" ) {
         Catch::JsonValueWriter{ stream }.write( "\"" );