diff --git a/actionpack/lib/action_dispatch/journey/path/pattern.rb b/actionpack/lib/action_dispatch/journey/path/pattern.rb
index 6924dc92c2..697f5b9d8b 100644
--- a/actionpack/lib/action_dispatch/journey/path/pattern.rb
+++ b/actionpack/lib/action_dispatch/journey/path/pattern.rb
@@ -119,7 +119,7 @@ module ActionDispatch
 
         class UnanchoredRegexp < AnchoredRegexp # :nodoc:
           def accept(node)
-            %r{\A#{visit node}\b}
+            %r{\A#{visit node}(?:\b|\Z)}
           end
         end
 
diff --git a/actionpack/test/journey/path/pattern_test.rb b/actionpack/test/journey/path/pattern_test.rb
index 97d99064f2..fcfaba96b0 100644
--- a/actionpack/test/journey/path/pattern_test.rb
+++ b/actionpack/test/journey/path/pattern_test.rb
@@ -34,17 +34,17 @@ module ActionDispatch
         end
 
         {
-          "/:controller(/:action)"       => %r{\A/(#{x})(?:/([^/.?]+))?\b},
-          "/:controller/foo"             => %r{\A/(#{x})/foo\b},
-          "/:controller/:action"         => %r{\A/(#{x})/([^/.?]+)\b},
-          "/:controller"                 => %r{\A/(#{x})\b},
-          "/:controller(/:action(/:id))" => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?\b},
-          "/:controller/:action.xml"     => %r{\A/(#{x})/([^/.?]+)\.xml\b},
-          "/:controller.:format"         => %r{\A/(#{x})\.([^/.?]+)\b},
-          "/:controller(.:format)"       => %r{\A/(#{x})(?:\.([^/.?]+))?\b},
-          "/:controller/*foo"            => %r{\A/(#{x})/(.+)\b},
-          "/:controller/*foo/bar"        => %r{\A/(#{x})/(.+)/bar\b},
-          "/:foo|*bar"                   => %r{\A/(?:([^/.?]+)|(.+))\b},
+          "/:controller(/:action)"       => %r{\A/(#{x})(?:/([^/.?]+))?(?:\b|\Z)},
+          "/:controller/foo"             => %r{\A/(#{x})/foo(?:\b|\Z)},
+          "/:controller/:action"         => %r{\A/(#{x})/([^/.?]+)(?:\b|\Z)},
+          "/:controller"                 => %r{\A/(#{x})(?:\b|\Z)},
+          "/:controller(/:action(/:id))" => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?(?:\b|\Z)},
+          "/:controller/:action.xml"     => %r{\A/(#{x})/([^/.?]+)\.xml(?:\b|\Z)},
+          "/:controller.:format"         => %r{\A/(#{x})\.([^/.?]+)(?:\b|\Z)},
+          "/:controller(.:format)"       => %r{\A/(#{x})(?:\.([^/.?]+))?(?:\b|\Z)},
+          "/:controller/*foo"            => %r{\A/(#{x})/(.+)(?:\b|\Z)},
+          "/:controller/*foo/bar"        => %r{\A/(#{x})/(.+)/bar(?:\b|\Z)},
+          "/:foo|*bar"                   => %r{\A/(?:([^/.?]+)|(.+))(?:\b|\Z)},
         }.each do |path, expected|
           define_method(:"test_to_non_anchored_regexp_#{Regexp.escape(path)}") do
             path = Pattern.build(