diff --git a/.rubocop.yml b/.rubocop.yml
index a6649146..30124ba5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -125,10 +125,14 @@ Security/YAMLLoad:
 
 Style/AccessModifierDeclarations:
   Enabled: false
+Style/AccessorGrouping:
+  Enabled: false
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 Style/AndOr:
   Severity: error
+Style/BisectedAttrAccessor:
+  Enabled: true
 Style/ClassAndModuleChildren:
   Exclude:
     - test/**/*.rb
@@ -172,6 +176,8 @@ Style/PercentLiteralDelimiters:
     "%w": "()"
     "%W": "()"
     "%x": "()"
+Style/RedundantAssignment:
+  Enabled: true
 Style/RedundantFetchBlock:
   Enabled: false
 Style/RedundantRegexpCharacterClass:
diff --git a/Gemfile b/Gemfile
index c3c84152..2e22a25d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ group :test do
   gem "nokogiri", "~> 1.7"
   gem "rspec"
   gem "rspec-mocks"
-  gem "rubocop", "~> 0.86.0"
+  gem "rubocop", "~> 0.87.1"
   gem "rubocop-performance"
   gem "test-dependency-theme", :path => File.expand_path("test/fixtures/test-dependency-theme", __dir__)
   gem "test-theme", :path => File.expand_path("test/fixtures/test-theme", __dir__)