diff --git a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
index 94b60bd9..a51b8274 100644
--- a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
+++ b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/array.pass.cpp
@@ -27,7 +27,7 @@ int main()
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
         const int indices[] = {-1, 0, 1};
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, indices);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
diff --git a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
index 0de14489..b40d7eb9 100644
--- a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
+++ b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/init.pass.cpp
@@ -26,7 +26,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, {-1, 0, 1});
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
diff --git a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
index 644db463..d8111363 100644
--- a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
+++ b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/int.pass.cpp
@@ -24,7 +24,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -43,7 +43,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "555-1234");
@@ -59,7 +59,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, 1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "1234");
diff --git a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
index 8977544f..b04f5804 100644
--- a/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
+++ b/test/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.pass.cpp
@@ -28,7 +28,7 @@ int main()
         std::vector<int> v;
         v.push_back(-1);
         v.push_back(-1);
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, v);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -59,7 +59,7 @@ int main()
         std::vector<int> v;
         v.push_back(-1);
         v.push_back(0);
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, v);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -91,7 +91,7 @@ int main()
         v.push_back(-1);
         v.push_back(0);
         v.push_back(1);
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, v);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
diff --git a/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
index c3a2d15f..d6399f11 100644
--- a/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
+++ b/test/re/re.iter/re.tokiter/re.tokiter.comp/equal.pass.cpp
@@ -22,7 +22,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert(!(i == std::cregex_token_iterator()));
diff --git a/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
index 91ee2671..b096e3c0 100644
--- a/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
+++ b/test/re/re.iter/re.tokiter/re.tokiter.deref/deref.pass.cpp
@@ -21,7 +21,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert((*i).str() == "start ");
@@ -40,7 +40,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers);
         assert(i != std::cregex_token_iterator());
         assert((*i).str() == "555-1234");
@@ -56,7 +56,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, 1);
         assert(i != std::cregex_token_iterator());
         assert((*i).str() == "1234");
diff --git a/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp b/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
index d509b8fa..d1791957 100644
--- a/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
+++ b/test/re/re.iter/re.tokiter/re.tokiter.incr/post.pass.cpp
@@ -21,7 +21,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, -1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "start ");
@@ -40,7 +40,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "555-1234");
@@ -56,7 +56,7 @@ int main()
     {
         std::regex phone_numbers("\\d{3}-(\\d{4})");
         const char phone_book[] = "start 555-1234, 555-2345, 555-3456 end";
-        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book),
+        std::cregex_token_iterator i(std::begin(phone_book), std::end(phone_book)-1,
                                      phone_numbers, 1);
         assert(i != std::cregex_token_iterator());
         assert(i->str() == "1234");