diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index fd024928341e1..c8773c91793bb 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   `assert_template` can be used to assert on the same template with different locals
+    Fix #3675
+
+    *Yves Senn*
+
 *   Remove old asset tag concatenation (no longer needed now that we have the asset pipeline). *Josh Peek*
 
 *   Accept :remote as symbolic option for `link_to` helper. *Riley Lynch*
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index ace5a2c822944..6aa43edf47efc 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -123,11 +123,17 @@ def assert_template(options = {}, message = nil)
 
         if expected_partial = options[:partial]
           if expected_locals = options[:locals]
-            if defined?(@locals)
-              actual_locals = @locals[expected_partial.to_s.sub(/^_/,'')]
-              expected_locals.each_pair do |k,v|
-                assert_equal(v, actual_locals[k])
+            if defined?(@_locals)
+              actual_locals_collection = @_locals[expected_partial.to_s.sub(/^_/,'')]
+              result = actual_locals_collection.any? do |actual_locals|
+                expected_locals.each_pair.all? do |k,v|
+                  v == actual_locals[k]
+                end
               end
+              msg = 'expecting %s to be rendered with %s but was with %s' % [expected_partial,
+                                                                             expected_locals,
+                                                                             actual_locals_collection]
+              assert(result, msg)
             else
               warn "the :locals option to #assert_template is only supported in a ActionView::TestCase"
             end
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 5434b3421e50e..6e5a3a63ca9de 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -120,7 +120,7 @@ def render(options = {}, local_assigns = {}, &block)
       end
 
       def locals
-        @locals ||= {}
+        @_locals ||= {}
       end
 
       included do
@@ -162,12 +162,15 @@ def render(options = {}, local_assigns = {})
           case options
           when Hash
             if block_given?
-              locals[options[:layout]] = options[:locals]
+              locals[options[:layout]] ||= []
+              locals[options[:layout]] << options[:locals]
             elsif options.key?(:partial)
-              locals[options[:partial]] = options[:locals]
+              locals[options[:partial]] ||= []
+              locals[options[:partial]] << options[:locals]
             end
           else
-            locals[options] = local_assigns
+            locals[options] ||= []
+            locals[options] << local_assigns
           end
 
           super
@@ -197,7 +200,7 @@ def view
         :@_routes,
         :@controller,
         :@_layouts,
-        :@locals,
+        :@_locals,
         :@method_name,
         :@output_buffer,
         :@_partials,
diff --git a/actionpack/test/fixtures/test/render_two_partials.html.erb b/actionpack/test/fixtures/test/render_two_partials.html.erb
new file mode 100644
index 0000000000000..3db6025860a2c
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_two_partials.html.erb
@@ -0,0 +1,2 @@
+<%= render :partial => 'partial', :locals => {'first' => '1'} %>
+<%= render :partial => 'partial', :locals => {'second' => '2'} %>
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 5265ae6b3a463..c7231d9cd5c27 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -321,6 +321,14 @@ class RenderTemplateTest < ActionView::TestCase
         assert_template :partial => "_partial_for_use_in_layout", :locals => { :name => "Somebody Else" }
       end
     end
+
+    test 'supports different locals on the same partial' do
+      controller.controller_path = "test"
+      render(:template => "test/render_two_partials")
+      assert_template partial: '_partial', locals: { 'first' => '1' }
+      assert_template partial: '_partial', locals: { 'second' => '2' }
+    end
+
   end
 
   module AHelperWithInitialize