diff --git a/spec/chat_controller_spec.rb b/spec/controllers/chat_controller_spec.rb
similarity index 99%
rename from spec/chat_controller_spec.rb
rename to spec/controllers/chat_controller_spec.rb
index bc2c1dc..daf5094 100644
--- a/spec/chat_controller_spec.rb
+++ b/spec/controllers/chat_controller_spec.rb
@@ -1,5 +1,5 @@
 require 'rails_helper'
-require_relative './dummy_provider'
+require_relative '../dummy_provider'
 
 describe 'Chat Controller', type: :request do
   let(:first_post) { Fabricate(:post) }
diff --git a/spec/lib/discourse_chat/helper_spec.rb b/spec/helpers/helper_spec.rb
similarity index 100%
rename from spec/lib/discourse_chat/helper_spec.rb
rename to spec/helpers/helper_spec.rb
diff --git a/spec/jobs/notify_chats_spec.rb b/spec/jobs/regular/notify_chats_spec.rb
similarity index 100%
rename from spec/jobs/notify_chats_spec.rb
rename to spec/jobs/regular/notify_chats_spec.rb
diff --git a/spec/lib/discourse_chat/rule_spec.rb b/spec/models/rule_spec.rb
similarity index 100%
rename from spec/lib/discourse_chat/rule_spec.rb
rename to spec/models/rule_spec.rb
diff --git a/spec/lib/discourse_chat/manager_spec.rb b/spec/services/manager_spec.rb
similarity index 99%
rename from spec/lib/discourse_chat/manager_spec.rb
rename to spec/services/manager_spec.rb
index 29ade51..dd0225e 100644
--- a/spec/lib/discourse_chat/manager_spec.rb
+++ b/spec/services/manager_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 require_dependency 'post_creator'
-require_relative '../../dummy_provider'
+require_relative '../dummy_provider'
 
 RSpec.describe DiscourseChat::Manager do