diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 8cacca668f648ec92fad546081c17f77a68c59dc..2a88dac63539b6eb6d1f4458b09a920ed02c239f 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -20,17 +20,13 @@ def test_controller_skeleton_is_created
         assert_match(/@users = User\.all/, m)
       end
 
-      assert_instance_method :show, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
-      end
+      assert_instance_method :show, content
 
       assert_instance_method :new, content do |m|
         assert_match(/@user = User\.new/, m)
       end
 
-      assert_instance_method :edit, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
-      end
+      assert_instance_method :edit, content
 
       assert_instance_method :create, content do |m|
         assert_match(/@user = User\.new\(user_params\)/, m)
@@ -39,16 +35,18 @@ def test_controller_skeleton_is_created
       end
 
       assert_instance_method :update, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
         assert_match(/@user\.update_attributes\(user_params\)/, m)
         assert_match(/@user\.errors/, m)
       end
 
       assert_instance_method :destroy, content do |m|
-        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
         assert_match(/@user\.destroy/, m)
       end
 
+      assert_instance_method :set_user, content do |m|
+        assert_match(/@user = User\.find\(params\[:id\]\)/, m)
+      end
+
       assert_match(/def user_params/, content)
       assert_match(/params\.require\(:user\)\.permit\(:name, :age\)/, content)
     end