diff --git a/.travis.yml b/.travis.yml
index 8354e11..23654b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,14 @@ rvm:
 gemfile:
   - gemfiles/Gemfile-rails-5-2
   - gemfiles/Gemfile-rails-6-0
-  - gemfiles/Gemfile-rails-master
+  - gemfiles/Gemfile-rails-main
 matrix:
   allow_failures:
+    - gemfile: gemfiles/Gemfile-rails-main
     - rvm: ruby-head
+  exclude:
+    - rvm: 2.5.3
+      gemfile: gemfiles/Gemfile-rails-main
+    - rvm: 2.6.5
+      gemfile: gemfiles/Gemfile-rails-main
   fast_finish: true
-env:
-  global:
-    - "JRUBY_OPTS=-Xcext.enabled=true"
diff --git a/gemfiles/Gemfile-rails-main b/gemfiles/Gemfile-rails-main
new file mode 100644
index 0000000..6953313
--- /dev/null
+++ b/gemfiles/Gemfile-rails-main
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: '..'
+
+gem 'actionpack', git: "https://github.com/rails/rails.git", branch: 'main'
diff --git a/gemfiles/Gemfile-rails-master b/gemfiles/Gemfile-rails-master
deleted file mode 100644
index 1d1e2f6..0000000
--- a/gemfiles/Gemfile-rails-master
+++ /dev/null
@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-gemspec path: '..'
-
-gem 'actionpack', git: "https://github.com/rails/rails.git"