diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 6f8537ef..08cb3da4 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -772,5 +772,5 @@ with expansion:
   "first" == "second"
 
 ===============================================================================
-123 test cases - 39 failed (677 assertions - 92 failed)
+123 test cases - 39 failed (691 assertions - 92 failed)
 
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 22d22af5..4535f32d 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -6125,6 +6125,118 @@ PASSED:
 with expansion:
   true == true
 
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Redundant wildcard at the start
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Redundant wildcard at the end
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Redundant wildcard at both ends
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+-------------------------------------------------------------------------------
+Parse test names and tags
+  Wildcard at both ends, redundant at start
+-------------------------------------------------------------------------------
+CmdLineTests.cpp:<line number>
+...............................................................................
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.hasFilters() == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcA ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcB ) == false )
+with expansion:
+  false == false
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcC ) == true )
+with expansion:
+  true == true
+
+CmdLineTests.cpp:<line number>:
+PASSED:
+  CHECK( spec.matches( tcD ) == true )
+with expansion:
+  true == true
+
 -------------------------------------------------------------------------------
 Parse test names and tags
   Just wildcard
@@ -7071,5 +7183,5 @@ with expansion:
   true
 
 ===============================================================================
-123 test cases - 54 failed (696 assertions - 111 failed)
+123 test cases - 54 failed (710 assertions - 111 failed)
 
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 40ecb7ce..8941d755 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,5 @@
 <testsuites>
-  <testsuite errors="12" failures="99" tests="696" hostname="tbd" time="{duration}" timestamp="tbd">
+  <testsuite errors="12" failures="99" tests="710" hostname="tbd" time="{duration}" timestamp="tbd">
     <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
@@ -533,6 +533,10 @@ TrickyTests.cpp:<line number>
     <testcase classname="Parse test names and tags" name="Wildcard at the start" time="{duration}"/>
     <testcase classname="Parse test names and tags" name="Wildcard at the end" time="{duration}"/>
     <testcase classname="Parse test names and tags" name="Wildcard at both ends" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Redundant wildcard at the start" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Redundant wildcard at the end" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Redundant wildcard at both ends" time="{duration}"/>
+    <testcase classname="Parse test names and tags" name="Wildcard at both ends, redundant at start" time="{duration}"/>
     <testcase classname="Parse test names and tags" name="Just wildcard" time="{duration}"/>
     <testcase classname="Parse test names and tags" name="Single tag" time="{duration}"/>
     <testcase classname="Parse test names and tags" name="Single tag, two matches" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 1d6579d8..66a0e09e 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -6301,6 +6301,130 @@ there&quot;
         </Expression>
         <OverallResults successes="6" failures="0"/>
       </Section>
+      <Section name="Redundant wildcard at the start">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.hasFilters() == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcA ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcB ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="Redundant wildcard at the end">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.hasFilters() == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcA ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcB ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="Redundant wildcard at both ends">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.hasFilters() == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcA ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcB ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <OverallResults successes="3" failures="0"/>
+      </Section>
+      <Section name="Wildcard at both ends, redundant at start">
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.hasFilters() == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcA ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcB ) == false
+          </Original>
+          <Expanded>
+            false == false
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcC ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
+          <Original>
+            spec.matches( tcD ) == true
+          </Original>
+          <Expanded>
+            true == true
+          </Expanded>
+        </Expression>
+        <OverallResults successes="5" failures="0"/>
+      </Section>
       <Section name="Just wildcard">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
           <Original>
@@ -7315,7 +7439,7 @@ there&quot;
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="585" failures="111"/>
+    <OverallResults successes="599" failures="111"/>
   </Group>
-  <OverallResults successes="585" failures="111"/>
+  <OverallResults successes="599" failures="111"/>
 </Catch>