diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1ea1d84435..02b9f74067 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,4 +28,6 @@ jobs:
       run: bundle exec rake
       env:
         RUBYOPT: --enable-frozen_string_literal
+    - if: ${{ matrix.ruby == 'head' && startsWith(matrix.os, 'ubuntu') }}
+      run: bundle exec rake rubocop
 
diff --git a/Gemfile b/Gemfile
index b7bd49a8cf..de6bd3af6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,6 @@ group :development do
   gem 'racc', '> 1.4.10'
   gem 'kpeg', github: 'evanphx/kpeg'
   gem 'test-unit'
-  gem 'rubocop'
+  gem 'rubocop', '>= 1.31.0'
   gem 'gettext'
 end
diff --git a/Rakefile b/Rakefile
index ba4a342d2d..d05714bbd3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -105,5 +105,5 @@ else
   RuboCop::RakeTask.new(:rubocop) do |t|
     t.options = [*parsed_files]
   end
-  task :build => [:generate, "rubocop:auto_correct"]
+  task :build => [:generate, "rubocop:autocorrect"]
 end