diff --git a/Gemfile b/Gemfile
index e2eff4df..b1c0ab7a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,10 +2,18 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :local_development do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'appraisal'
-  gem 'rake'
-  gem 'byebug', platforms: [:mri]
-end
+# Dev libs
+gem 'appraisal'
+gem 'barrier'
+gem 'byebug', platforms: [:mri]
+gem 'database_cleaner'
+gem 'rake'
+gem 'rspec'
+gem 'rspec-rails'
+gem 'rspec-its'
+
+# Fallback to sqlite3 in dev/local environment
+gem 'sqlite3'
+
+# Dev tools / linter
+gem 'guard-rspec', require: false
diff --git a/acts-as-taggable-on.gemspec b/acts-as-taggable-on.gemspec
index 9edfc0cd..e022cc90 100644
--- a/acts-as-taggable-on.gemspec
+++ b/acts-as-taggable-on.gemspec
@@ -23,10 +23,4 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'activerecord', '>= 7.1', '< 8.2'
   gem.add_runtime_dependency 'zeitwerk', '>= 2.4', '< 3.0'
-
-  gem.add_development_dependency 'rspec-rails'
-  gem.add_development_dependency 'rspec-its'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'barrier'
-  gem.add_development_dependency 'database_cleaner'
 end
diff --git a/gemfiles/activerecord_7.1.gemfile b/gemfiles/activerecord_7.1.gemfile
index 1ce5bbe8..2dd97303 100644
--- a/gemfiles/activerecord_7.1.gemfile
+++ b/gemfiles/activerecord_7.1.gemfile
@@ -2,17 +2,18 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "barrier"
+gem "byebug", platforms: [:mri]
+gem "database_cleaner"
+gem "rake"
+gem "rspec"
+gem "rspec-rails"
+gem "rspec-its"
+gem "sqlite3", "~> 1.4"
+gem "guard-rspec", require: false
 gem "activerecord", "~> 7.1.0"
 gem "pg"
-gem "sqlite3", "~> 1.4"
 gem "mysql2", "~> 0.5"
 
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", platforms: [:mri]
-end
-
 gemspec path: "../"
diff --git a/gemfiles/activerecord_7.2.gemfile b/gemfiles/activerecord_7.2.gemfile
index 84952fe1..f825cd0f 100644
--- a/gemfiles/activerecord_7.2.gemfile
+++ b/gemfiles/activerecord_7.2.gemfile
@@ -2,17 +2,18 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "barrier"
+gem "byebug", platforms: [:mri]
+gem "database_cleaner"
+gem "rake"
+gem "rspec"
+gem "rspec-rails"
+gem "rspec-its"
+gem "sqlite3", "~> 2.2"
+gem "guard-rspec", require: false
 gem "activerecord", "~> 7.2.0"
 gem "pg"
-gem "sqlite3", "~> 2.2"
 gem "mysql2", "~> 0.5"
 
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", platforms: [:mri]
-end
-
 gemspec path: "../"
diff --git a/gemfiles/activerecord_8.0.gemfile b/gemfiles/activerecord_8.0.gemfile
index f3685e2d..0bb875b3 100644
--- a/gemfiles/activerecord_8.0.gemfile
+++ b/gemfiles/activerecord_8.0.gemfile
@@ -2,17 +2,18 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "barrier"
+gem "byebug", platforms: [:mri]
+gem "database_cleaner"
+gem "rake"
+gem "rspec"
+gem "rspec-rails"
+gem "rspec-its"
+gem "sqlite3", "~> 2.2"
+gem "guard-rspec", require: false
 gem "activerecord", "~> 8.0.0"
 gem "pg"
-gem "sqlite3", "~> 2.2"
 gem "mysql2", "~> 0.5"
 
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", platforms: [:mri]
-end
-
 gemspec path: "../"
diff --git a/gemfiles/activerecord_8.1.gemfile b/gemfiles/activerecord_8.1.gemfile
index 304b5a1a..9eed1385 100644
--- a/gemfiles/activerecord_8.1.gemfile
+++ b/gemfiles/activerecord_8.1.gemfile
@@ -2,17 +2,18 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "barrier"
+gem "byebug", platforms: [:mri]
+gem "database_cleaner"
+gem "rake"
+gem "rspec"
+gem "rspec-rails"
+gem "rspec-its"
+gem "sqlite3", "~> 2.2"
+gem "guard-rspec", require: false
 gem "activerecord", "~> 8.1.0"
 gem "pg"
-gem "sqlite3", "~> 2.2"
 gem "mysql2", "~> 0.5"
 
-group :local_development do
-  gem "guard"
-  gem "guard-rspec"
-  gem "appraisal"
-  gem "rake"
-  gem "byebug", platforms: [:mri]
-end
-
 gemspec path: "../"