diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1fef0c9..c79bc65 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -31,20 +31,16 @@ RSpec/DescribeClass:
     - '**/spec/views/**/*'
     - 'spec/integration/influxdb_rails_sends_metrics_spec.rb'
 
-# Offense count: 36
+# Offense count: 35
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 19
 
-# Offense count: 5
+# Offense count: 1
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
 # Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
-    - 'spec/unit/block_instrumentation_spec.rb'
-    - 'spec/unit/configuration_spec.rb'
-    - 'spec/unit/sql/normalizer_spec.rb'
-    - 'spec/unit/sql/query_spec.rb'
     - 'spec/unit/tags.rb'
 
 # Offense count: 3
@@ -56,24 +52,8 @@ RSpec/MultipleExpectations:
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
-    - 'spec/unit/configuration_spec.rb'
-    - 'spec/unit/sql/query_spec.rb'
-
-# Offense count: 2
-RSpec/RepeatedDescription:
-  Exclude:
-    - 'spec/requests/active_record_sql_metrics_spec.rb'
-
-# Offense count: 4
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
-RSpec/SpecFilePathFormat:
-  Exclude:
-    - '**/spec/routing/**/*'
-    - 'spec/unit/block_instrumentation_spec.rb'
-    - 'spec/unit/configuration_spec.rb'
-    - 'spec/unit/sql/normalizer_spec.rb'
-    - 'spec/unit/sql/query_spec.rb'
+    - 'spec/unit/influx_db/rails/configuration_spec.rb'
+    - 'spec/unit/influx_db/rails/sql/query_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: Include.
diff --git a/spec/unit/configuration_spec.rb b/spec/unit/influx_db/rails/configuration_spec.rb
similarity index 100%
rename from spec/unit/configuration_spec.rb
rename to spec/unit/influx_db/rails/configuration_spec.rb
diff --git a/spec/unit/sql/normalizer_spec.rb b/spec/unit/influx_db/rails/sql/normalizer_spec.rb
similarity index 100%
rename from spec/unit/sql/normalizer_spec.rb
rename to spec/unit/influx_db/rails/sql/normalizer_spec.rb
diff --git a/spec/unit/sql/query_spec.rb b/spec/unit/influx_db/rails/sql/query_spec.rb
similarity index 100%
rename from spec/unit/sql/query_spec.rb
rename to spec/unit/influx_db/rails/sql/query_spec.rb
diff --git a/spec/unit/block_instrumentation_spec.rb b/spec/unit/influx_db/rails_spec.rb
similarity index 100%
rename from spec/unit/block_instrumentation_spec.rb
rename to spec/unit/influx_db/rails_spec.rb