diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index 455b4945..2b974606 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -704,21 +704,21 @@ Generators.tests.cpp:<line number>: passed: chunk(2, value(1)), Catch::Generator
 Generators.tests.cpp:<line number>: passed: j < i for: -3 < 1
 Generators.tests.cpp:<line number>: passed: j < i for: -2 < 1
 Generators.tests.cpp:<line number>: passed: j < i for: -1 < 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 4 > 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 4 > 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 4 > 3
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 1
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 2
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 3
 Generators.tests.cpp:<line number>: passed: j < i for: -3 < 2
 Generators.tests.cpp:<line number>: passed: j < i for: -2 < 2
 Generators.tests.cpp:<line number>: passed: j < i for: -1 < 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 8 > 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 8 > 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 8 > 3
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 1
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 2
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 3
 Generators.tests.cpp:<line number>: passed: j < i for: -3 < 3
 Generators.tests.cpp:<line number>: passed: j < i for: -2 < 3
 Generators.tests.cpp:<line number>: passed: j < i for: -1 < 3
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 12 > 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 12 > 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 12 > 3
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 1
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 2
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 3
 GeneratorsImpl.tests.cpp:<line number>: passed: gen.get() == 123 for: 123 == 123
 GeneratorsImpl.tests.cpp:<line number>: passed: !(gen.next()) for: !false
 GeneratorsImpl.tests.cpp:<line number>: passed: gen.get() == 1 for: 1 == 1
diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
index 42eb635c..913255e5 100644
--- a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -702,21 +702,21 @@ Generators.tests.cpp:<line number>: passed: chunk(2, value(1)), Catch::Generator
 Generators.tests.cpp:<line number>: passed: j < i for: -3 < 1
 Generators.tests.cpp:<line number>: passed: j < i for: -2 < 1
 Generators.tests.cpp:<line number>: passed: j < i for: -1 < 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 4 > 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 4 > 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 4 > 3
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 1
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 2
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 3
 Generators.tests.cpp:<line number>: passed: j < i for: -3 < 2
 Generators.tests.cpp:<line number>: passed: j < i for: -2 < 2
 Generators.tests.cpp:<line number>: passed: j < i for: -1 < 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 8 > 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 8 > 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 8 > 3
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 1
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 2
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 3
 Generators.tests.cpp:<line number>: passed: j < i for: -3 < 3
 Generators.tests.cpp:<line number>: passed: j < i for: -2 < 3
 Generators.tests.cpp:<line number>: passed: j < i for: -1 < 3
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 12 > 1
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 12 > 2
-Generators.tests.cpp:<line number>: passed: 4u * i > str.size() for: 12 > 3
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 1
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 2
+Generators.tests.cpp:<line number>: passed: 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 3
 GeneratorsImpl.tests.cpp:<line number>: passed: gen.get() == 123 for: 123 == 123
 GeneratorsImpl.tests.cpp:<line number>: passed: !(gen.next()) for: !false
 GeneratorsImpl.tests.cpp:<line number>: passed: gen.get() == 1 for: 1 == 1
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index 036cd368..3dc91c8a 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -5358,7 +5358,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   4 > 1
 
@@ -5370,7 +5370,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   4 > 2
 
@@ -5382,7 +5382,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   4 > 3
 
@@ -5430,7 +5430,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   8 > 1
 
@@ -5442,7 +5442,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   8 > 2
 
@@ -5454,7 +5454,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   8 > 3
 
@@ -5502,7 +5502,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   12 > 1
 
@@ -5514,7 +5514,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   12 > 2
 
@@ -5526,7 +5526,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   12 > 3
 
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index 33ee3da5..6e0a0b33 100644
--- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -5356,7 +5356,7 @@ Generators.tests.cpp:<line number>
 ...............................................................................
 
 Generators.tests.cpp:<line number>: PASSED:
-  REQUIRE( 4u * i > str.size() )
+  REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
 with expansion:
   4 > 1
 
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index aeefa5ae..d2354590 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -1341,11 +1341,11 @@ ok {test-number} - j < i for: -2 < 1
 # Generators -- simple
 ok {test-number} - j < i for: -1 < 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 4 > 1
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 4 > 2
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 4 > 3
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 3
 # Generators -- simple
 ok {test-number} - j < i for: -3 < 2
 # Generators -- simple
@@ -1353,11 +1353,11 @@ ok {test-number} - j < i for: -2 < 2
 # Generators -- simple
 ok {test-number} - j < i for: -1 < 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 8 > 1
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 8 > 2
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 8 > 3
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 3
 # Generators -- simple
 ok {test-number} - j < i for: -3 < 3
 # Generators -- simple
@@ -1365,11 +1365,11 @@ ok {test-number} - j < i for: -2 < 3
 # Generators -- simple
 ok {test-number} - j < i for: -1 < 3
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 12 > 1
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 12 > 2
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 12 > 3
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 3
 # Generators internals
 ok {test-number} - gen.get() == 123 for: 123 == 123
 # Generators internals
diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
index 28763e31..a1d86622 100644
--- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
@@ -1339,11 +1339,11 @@ ok {test-number} - j < i for: -2 < 1
 # Generators -- simple
 ok {test-number} - j < i for: -1 < 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 4 > 1
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 4 > 2
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 4 > 3
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 4 > 3
 # Generators -- simple
 ok {test-number} - j < i for: -3 < 2
 # Generators -- simple
@@ -1351,11 +1351,11 @@ ok {test-number} - j < i for: -2 < 2
 # Generators -- simple
 ok {test-number} - j < i for: -1 < 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 8 > 1
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 8 > 2
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 8 > 3
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 8 > 3
 # Generators -- simple
 ok {test-number} - j < i for: -3 < 3
 # Generators -- simple
@@ -1363,11 +1363,11 @@ ok {test-number} - j < i for: -2 < 3
 # Generators -- simple
 ok {test-number} - j < i for: -1 < 3
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 12 > 1
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 1
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 12 > 2
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 2
 # Generators -- simple
-ok {test-number} - 4u * i > str.size() for: 12 > 3
+ok {test-number} - 4u * static_cast<std::size_t>(i) > str.size() for: 12 > 3
 # Generators internals
 ok {test-number} - gen.get() == 123 for: 123 == 123
 # Generators internals
diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt
index 4d70789d..dcd9c3d1 100644
--- a/tests/SelfTest/Baselines/xml.sw.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.approved.txt
@@ -6086,7 +6086,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           4 > 1
@@ -6097,7 +6097,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           4 > 2
@@ -6108,7 +6108,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           4 > 3
@@ -6152,7 +6152,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           8 > 1
@@ -6163,7 +6163,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           8 > 2
@@ -6174,7 +6174,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           8 > 3
@@ -6218,7 +6218,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           12 > 1
@@ -6229,7 +6229,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           12 > 2
@@ -6240,7 +6240,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           12 > 3
diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
index 0e390165..5f247a22 100644
--- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt
@@ -6086,7 +6086,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           4 > 1
@@ -6097,7 +6097,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           4 > 2
@@ -6108,7 +6108,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           4 > 3
@@ -6152,7 +6152,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           8 > 1
@@ -6163,7 +6163,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           8 > 2
@@ -6174,7 +6174,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           8 > 3
@@ -6218,7 +6218,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           12 > 1
@@ -6229,7 +6229,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           12 > 2
@@ -6240,7 +6240,7 @@ C
     <Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
       <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
         <Original>
-          4u * i > str.size()
+          4u * static_cast<std::size_t>(i) > str.size()
         </Original>
         <Expanded>
           12 > 3
diff --git a/tests/SelfTest/UsageTests/Generators.tests.cpp b/tests/SelfTest/UsageTests/Generators.tests.cpp
index 38e32c4e..b9b65515 100644
--- a/tests/SelfTest/UsageTests/Generators.tests.cpp
+++ b/tests/SelfTest/UsageTests/Generators.tests.cpp
@@ -26,7 +26,7 @@ TEST_CASE("Generators -- simple", "[generators]") {
     SECTION("two") {
         // You can also explicitly set type for generators via Catch::Generators::as
         auto str = GENERATE(as<std::string>{}, "a", "bb", "ccc");
-        REQUIRE(4u * static_cast<unsigned int>(i) > str.size());
+        REQUIRE(4u * static_cast<std::size_t>(i) > str.size());
     }
 }