diff --git a/test/action_controller/json_api/pagination_test.rb b/test/action_controller/json_api/pagination_test.rb
index 4286ed88..7c8ebec2 100644
--- a/test/action_controller/json_api/pagination_test.rb
+++ b/test/action_controller/json_api/pagination_test.rb
@@ -53,7 +53,7 @@ module ActionController
             'next' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
             'last' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1" }
 
-          get :render_pagination_using_will_paginate, page: { number: 2, size: 1 }
+          get :render_pagination_using_will_paginate, params: { page: { number: 2, size: 1 } }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
@@ -62,7 +62,7 @@ module ActionController
           expected_links = { 'self' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2",
             'next' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2",
             'last' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2" }
-          get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }
+          get :render_pagination_using_will_paginate, params: { page: { number: 1, size: 2 } }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
@@ -73,7 +73,7 @@ module ActionController
             'prev' => "#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
             'next' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
             'last' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1" }
-          get :render_pagination_using_kaminari, page: { number: 2, size: 1 }
+          get :render_pagination_using_kaminari, params: { page: { number: 2, size: 1 } }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
@@ -82,7 +82,7 @@ module ActionController
           expected_links = { 'self' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1",
             'first' => "#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1",
             'prev' => "#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1" }
-          get :render_pagination_using_kaminari, page: { number: 3, size: 1 }
+          get :render_pagination_using_kaminari, params: { page: { number: 3, size: 1 } }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
@@ -91,7 +91,7 @@ module ActionController
           expected_links = { 'self' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=2&teste=additional",
             'next' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional",
             'last' => "#{WILL_PAGINATE_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=2&teste=additional" }
-          get :render_pagination_using_will_paginate, page: { number: 1, size: 2 }, teste: 'additional'
+          get :render_pagination_using_will_paginate, params: { page: { number: 1, size: 2 }, teste: 'additional' }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
@@ -100,13 +100,13 @@ module ActionController
           expected_links = { 'self' => "#{KAMINARI_URI}?page%5Bnumber%5D=3&page%5Bsize%5D=1&teste=additional",
             'first' => "#{KAMINARI_URI}?page%5Bnumber%5D=1&page%5Bsize%5D=1&teste=additional",
             'prev' => "#{KAMINARI_URI}?page%5Bnumber%5D=2&page%5Bsize%5D=1&teste=additional" }
-          get :render_pagination_using_kaminari, page: { number: 3, size: 1 }, teste: 'additional'
+          get :render_pagination_using_kaminari, params: { page: { number: 3, size: 1 }, teste: 'additional' }
           response = JSON.parse(@response.body)
           assert_equal expected_links, response['links']
         end
 
         def test_array_without_pagination_links
-          get :render_array_without_pagination_links, page: { number: 2, size: 1 }
+          get :render_array_without_pagination_links, params: { page: { number: 2, size: 1 } }
           response = JSON.parse(@response.body)
           refute response.key? 'links'
         end
diff --git a/test/support/rails5_shims.rb b/test/support/rails5_shims.rb
new file mode 100644
index 00000000..5677d109
--- /dev/null
+++ b/test/support/rails5_shims.rb
@@ -0,0 +1,29 @@
+module Rails5Shims
+  module ControllerTests
+    # https://github.com/rails/rails/blob/b217354/actionpack/lib/action_controller/test_case.rb
+    REQUEST_KWARGS = [:params, :session, :flash, :method, :body, :xhr]
+
+    # Fold kwargs from test request into args
+    # Band-aid for DEPRECATION WARNING
+    def get(path, *args)
+      hash = args && args[0]
+      if hash.respond_to?(:key)
+        Rails5Shims::ControllerTests::REQUEST_KWARGS.each do |kwarg|
+          next unless hash.key?(kwarg)
+          hash.merge! hash.delete(kwarg)
+        end
+      end
+      super
+    end
+
+    # Uncomment for debugging where the kwargs warnings come from
+    # def non_kwarg_request_warning
+    #   super.tap do
+    #     STDOUT.puts caller[2..3]
+    #   end
+    # end
+  end
+end
+if Rails::VERSION::MAJOR < 5
+  ActionController::TestCase.send :include, Rails5Shims::ControllerTests
+end
diff --git a/test/support/test_case.rb b/test/support/test_case.rb
index c07b5bc0..8f1afe79 100644
--- a/test/support/test_case.rb
+++ b/test/support/test_case.rb
@@ -10,4 +10,10 @@ ActionController::TestCase.class_eval do
     @controller.view_assigns.each { |k, v| assigns.regular_writer(k, v) }
     key.nil? ? assigns : assigns[key]
   end
+
+  # Rails5: Uncomment for debugging where the warnings come from
+  # def non_kwarg_request_warning
+  #   super
+  #   STDOUT.puts caller[2..3]
+  # end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f494eba1..9d069820 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -64,6 +64,8 @@ require 'support/test_case'
 
 require 'support/serialization_testing'
 
+require 'support/rails5_shims'
+
 require 'fixtures/active_record'
 
 require 'fixtures/poro'