diff --git a/Gemfile b/Gemfile
index f8de372a..acf3fcb1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,6 +37,7 @@ group :development, :test do
   gem 'capybara'
   gem 'niftany'
   gem 'pry-byebug'
+  gem 'rubocop', '< 0.87'
   gem 'rails-controller-testing'
   gem 'rspec-rails'
   gem 'selenium-webdriver'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6638e6c2..d3c81e9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -320,13 +320,13 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (0.87.1)
+    rubocop (0.86.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.1.0)
@@ -440,6 +440,7 @@ DEPENDENCIES
   rails-controller-testing
   rsolr (>= 1.0)
   rspec-rails
+  rubocop (< 0.87)
   selenium-webdriver
   simplecov (< 0.18)
   spring