diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 939d0d89..6aaa7ed1 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -1003,6 +1003,6 @@ with expansion:
   "{?}" == "1"
 
 ===============================================================================
-test cases: 180 | 129 passed | 47 failed |  4 failed as expected
-assertions: 886 | 769 passed | 96 failed | 21 failed as expected
+test cases: 179 | 128 passed | 47 failed |  4 failed as expected
+assertions: 884 | 767 passed | 96 failed | 21 failed as expected
 
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 13da430d..10b6fc35 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -4655,28 +4655,6 @@ PASSED:
 with expansion:
   1 [30/1]s != 1 fs
 
--------------------------------------------------------------------------------
-Stringifying std::chrono::time_point<Clock>
--------------------------------------------------------------------------------
-ToStringChrono.cpp:<line number>
-...............................................................................
-
-ToStringChrono.cpp:<line number>:
-PASSED:
-  REQUIRE( now != later )
-with expansion:
-  {iso8601-timestamp}
-  !=
-  {iso8601-timestamp}
-
-ToStringChrono.cpp:<line number>:
-PASSED:
-  REQUIRE( now2 != later2 )
-with expansion:
-  {since-epoch-report}
-  !=
-  {since-epoch-report}
-
 -------------------------------------------------------------------------------
 Stringifying std::chrono::time_point<system_clock>
 -------------------------------------------------------------------------------
@@ -7512,6 +7490,6 @@ MiscTests.cpp:<line number>:
 PASSED:
 
 ===============================================================================
-test cases: 180 | 127 passed | 49 failed |  4 failed as expected
-assertions: 885 | 765 passed | 99 failed | 21 failed as expected
+test cases: 179 | 126 passed | 49 failed |  4 failed as expected
+assertions: 883 | 763 passed | 99 failed | 21 failed as expected
 
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 0dd6ab60..b306b393 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesloose text artifact
 >
-  <testsuite name="<exe-name>" errors="15" failures="85" tests="886" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="15" failures="85" tests="884" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/outside assertions" time="{duration}">
@@ -521,7 +521,6 @@ StringRef.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="StringRef/to std::string/assigned" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Stringifying std::chrono::duration helpers" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Stringifying std::chrono::duration with weird ratios" time="{duration}"/>
-    <testcase classname="<exe-name>.global" name="Stringifying std::chrono::time_point&lt;Clock>" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Stringifying std::chrono::time_point&lt;system_clock>" time="{duration}"/>
     <testcase classname="<exe-name>.global" name="Tabs and newlines show in output" time="{duration}">
       <failure message="&quot;if ($b == 10) {
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index c4b7ac38..da12285d 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -5296,29 +5296,6 @@ Message from section two
       </Expression>
       <OverallResult success="true"/>
     </TestCase>
-    <TestCase name="Stringifying std::chrono::time_point&lt;Clock>" tags="[chrono][toString]" filename="projects/<exe-name>/ToStringChrono.cpp" >
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringChrono.cpp" >
-        <Original>
-          now != later
-        </Original>
-        <Expanded>
-          {iso8601-timestamp}
-!=
-{iso8601-timestamp}
-        </Expanded>
-      </Expression>
-      <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringChrono.cpp" >
-        <Original>
-          now2 != later2
-        </Original>
-        <Expanded>
-          {since-epoch-report}
-!=
-{since-epoch-report}
-        </Expanded>
-      </Expression>
-      <OverallResult success="true"/>
-    </TestCase>
     <TestCase name="Stringifying std::chrono::time_point&lt;system_clock>" tags="[chrono][toString]" filename="projects/<exe-name>/ToStringChrono.cpp" >
       <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ToStringChrono.cpp" >
         <Original>
@@ -8291,7 +8268,7 @@ loose text artifact
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="765" failures="100" expectedFailures="21"/>
+    <OverallResults successes="763" failures="100" expectedFailures="21"/>
   </Group>
-  <OverallResults successes="765" failures="99" expectedFailures="21"/>
+  <OverallResults successes="763" failures="99" expectedFailures="21"/>
 </Catch>
diff --git a/projects/SelfTest/ToStringChrono.cpp b/projects/SelfTest/ToStringChrono.cpp
index 1716ce64..97d0c1cb 100644
--- a/projects/SelfTest/ToStringChrono.cpp
+++ b/projects/SelfTest/ToStringChrono.cpp
@@ -30,7 +30,7 @@ TEST_CASE("Stringifying std::chrono::time_point<system_clock>", "[toString][chro
     REQUIRE(now != later);
 }
 
-TEST_CASE("Stringifying std::chrono::time_point<Clock>", "[toString][chrono]") {
+TEST_CASE("Stringifying std::chrono::time_point<Clock>", "[toString][chrono][!nonportable]") {
     auto now = std::chrono::high_resolution_clock::now();
     auto later = now + std::chrono::minutes(2);
     REQUIRE(now != later);