diff --git a/Gemfile b/Gemfile
index 42351662e..cdc017cc1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,20 +2,22 @@ source "http://rubygems.org"
 
 gemspec
 
-# apps can also use will_paginate so there's no dependency in gemspec
-gem "kaminari"
+group :development, :test do
+  gem "byebug", platforms: %i[mri mingw x64_mingw]
+  gem "capybara"
+  gem "kaminari"
+  gem "rubocop", require: false
+  gem "selenium-webdriver"
+  gem "sqlite3"
+end
 
 group :development do
-  gem "awesome_print"
-  gem "better_errors"
-  gem "binding_of_caller"
   gem "listen"
-  gem "rubocop", "~> 0.51.0", require: false
+  gem "web-console"
 end
 
 group :test do
   gem "coveralls",  require: false
   gem "mocha",      require: false
   gem "rails-controller-testing"
-  gem "sqlite3"
 end
diff --git a/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb b/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb
index 0c6811cce..84f9d89a0 100644
--- a/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb
+++ b/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb
@@ -29,7 +29,7 @@ def cms_acts_as_tree(options = {})
         foreign_key:  configuration[:foreign_key],
         dependent:    configuration[:dependent]
 
-      class_eval <<-RUBY
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
         include ComfortableMexicanSofa::ActsAsTree::InstanceMethods
 
         scope :roots, -> {
diff --git a/lib/comfortable_mexican_sofa/extensions/has_revisions.rb b/lib/comfortable_mexican_sofa/extensions/has_revisions.rb
index f210efcea..10db0664e 100644
--- a/lib/comfortable_mexican_sofa/extensions/has_revisions.rb
+++ b/lib/comfortable_mexican_sofa/extensions/has_revisions.rb
@@ -7,7 +7,7 @@ def self.included(base)
   module ClassMethods
 
     def cms_has_revisions_for(*fields)
-      include ComfortableMexicanSofa::HasRevisions::InstanceMethods
+      include ComfortableMexicanSofa::HasRevisions::InstanceMethods # rubocop:disable Style/MixinUsage
 
       attr_accessor :revision_data
 
diff --git a/test/gemfiles/Gemfile.rails.5.2 b/test/gemfiles/Gemfile.rails.5.2
index b6abcf78d..c135b188a 100644
--- a/test/gemfiles/Gemfile.rails.5.2
+++ b/test/gemfiles/Gemfile.rails.5.2
@@ -2,11 +2,16 @@ source 'http://rubygems.org'
 
 gemspec path: "../../"
 
-gem 'kaminari', '>= 0.14.0'
+group :development, :test do
+  gem "byebug", platforms: %i[mri mingw x64_mingw]
+  gem "capybara"
+  gem "kaminari"
+  gem "rubocop", require: false
+  gem "selenium-webdriver"
+  gem "sqlite3"
+end
 
 group :test do
-  gem "rubocop", "~> 0.51.0", require: false
-  gem "sqlite3"
   gem "coveralls",  require: false
   gem "mocha",      require: false
   gem "rails-controller-testing"