diff --git a/.travis.yml b/.travis.yml
index 074ea456..6c5ae507 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ ruby_supported_versions:
 
 jruby_supported_versions:
   - &jruby_9_1 jruby-9.1.17.0
-  - &jruby_9_2 jruby-9.2.7.0
+  - &jruby_9_2 jruby-9.2.8.0
   - &jruby_head jruby-head
 
 jdk_supported_versions:
diff --git a/test/support/rails_app.rb b/test/support/rails_app.rb
index 718face6..5f81d434 100644
--- a/test/support/rails_app.rb
+++ b/test/support/rails_app.rb
@@ -9,6 +9,10 @@ module ActiveModelSerializers
       config.action_controller.perform_caching = true
       config.action_controller.cache_store = :memory_store
 
+      if Rails::VERSION::MAJOR >= 6
+        config.action_dispatch.return_only_media_type_on_content_type = true
+      end
+
       config.filter_parameters += [:password]
     end