diff --git a/.rubocop.yml b/.rubocop.yml
index f31d8344..ade00e6e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,15 +4,20 @@ AllCops:
   Exclude:
     - config/initializers/forbidden_yaml.rb
     - !ruby/regexp /(vendor|bundle|bin|db|tmp)\/.*/
-  RunRailsCops: true
   DisplayCopNames: true
   DisplayStyleGuide: true
 
+Rails:
+  Enabled: true
+
 Lint/NestedMethodDefinition:
   Enabled: false
   Exclude:
     - test/action_controller/serialization_test.rb
 
+Style/Alias:
+  EnforcedStyle: prefer_alias
+
 Style/StringLiterals:
   EnforcedStyle: single_quotes
 
@@ -59,6 +64,18 @@ Style/BlockDelimiters:
   Enabled: true
   EnforcedStyle: line_count_based
 
+Style/SignalException:
+  EnforcedStyle: semantic
+
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: no_comma
+
+Style/ConditionalAssignment:
+  Enabled: false
+
+Style/DotPosition:
+  EnforcedStyle: leading
+
 ########## test_helper.rb sanity
 Style/EndBlock:
   Exclude:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 43b34bb9..2584bf8d 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -177,14 +177,6 @@ Style/Semicolon:
   Exclude:
     - 'lib/active_model/serializer/fieldset.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Exclude:
-    - 'lib/active_model/serializer/fieldset.rb'
-    - 'lib/active_model/serializer/pass_through_serializer.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: AllowIfMethodIsEmpty.
@@ -223,16 +215,6 @@ Style/TrailingBlankLines:
     - 'test/serializers/cache_test.rb'
     - 'test/serializers/fieldset_test.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Exclude:
-    - 'test/action_controller/adapter_selector_test.rb'
-    - 'test/action_controller/serialization_test.rb'
-    - 'test/adapter/json_api/belongs_to_test.rb'
-    - 'test/adapter/json_api/linked_test.rb'
-
 # Offense count: 1
 Style/UnlessElse:
   Exclude:
diff --git a/Gemfile b/Gemfile
index 9f9282b5..67246f24 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,5 +44,5 @@ group :test do
 end
 
 group :development, :test do
-  gem 'rubocop', '~> 0.34.0', require: false
+  gem 'rubocop', '~> 0.36', require: false
 end