diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 10de4853c5..4b6d4fef97 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -203,6 +203,7 @@ module ActionDispatch
         self.default_url_options = {}
         self.request_class = request_class
         self.valid_conditions = request_class.public_instance_methods.select{ |m| m != "id" }.map{ |m| m.to_sym }
+        self.valid_conditions += [:controller, :action]
 
         @disable_clear_and_finalize = false
         clear!