4 files changed, 7 insertions, 7 deletions
diff --git a/spec/support/shared_examples/models/with_uploads_shared_examples.rb b/spec/support/shared_examples/models/with_uploads_shared_examples.rb
index 822836c771e..3d622ba8195 100644
--- a/spec/support/shared_examples/models/with_uploads_shared_examples.rb
+++ b/spec/support/shared_examples/models/with_uploads_shared_examples.rb
@@ -18,7 +18,7 @@ shared_examples_for 'model with uploads' do |supports_fileuploads|
       end
     end
 
-    context 'with not mounted uploads', :sidekiq, skip: !supports_fileuploads do
+    context 'with not mounted uploads', :sidekiq_might_not_need_inline, skip: !supports_fileuploads do
       context 'with local files' do
         let!(:uploads) { create_list(:upload, 2, uploader: FileUploader, model: model_object) }
 
diff --git a/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb
index ac7c17915de..a77d729aa2c 100644
--- a/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb
+++ b/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb
@@ -7,7 +7,7 @@ shared_examples 'merge quick action' do
       visit project_merge_request_path(project, merge_request)
     end
 
-    it 'merges the MR' do
+    it 'merges the MR', :sidekiq_might_not_need_inline do
       add_note("/merge")
 
       expect(page).to have_content 'Scheduled to merge this merge request when the pipeline succeeds.'
diff --git a/spec/support/shared_examples/requests/api/notes.rb b/spec/support/shared_examples/requests/api/notes.rb
index 354ae7288b1..4ce78d885bc 100644
--- a/spec/support/shared_examples/requests/api/notes.rb
+++ b/spec/support/shared_examples/requests/api/notes.rb
@@ -139,7 +139,7 @@ shared_examples 'noteable API' do |parent_type, noteable_type, id_name|
       expect(response).to have_gitlab_http_status(401)
     end
 
-    it "creates an activity event when a note is created" do
+    it "creates an activity event when a note is created", :sidekiq_might_not_need_inline do
       expect(Event).to receive(:create!)
 
       post api("/#{parent_type}/#{parent.id}/#{noteable_type}/#{noteable[id_name]}/notes", user), params: { body: 'hi!' }
diff --git a/spec/support/shared_examples/updating_mentions_shared_examples.rb b/spec/support/shared_examples/updating_mentions_shared_examples.rb
index 9a8f8012762..3295ab72987 100644
--- a/spec/support/shared_examples/updating_mentions_shared_examples.rb
+++ b/spec/support/shared_examples/updating_mentions_shared_examples.rb
@@ -27,7 +27,7 @@ RSpec.shared_examples 'updating mentions' do |service_class|
         update_mentionable(title: "For #{mentioned_user.to_reference}")
       end
 
-      it 'emails only the newly-mentioned user' do
+      it 'emails only the newly-mentioned user', :sidekiq_might_not_need_inline do
         should_only_email(mentioned_user)
       end
     end
@@ -37,7 +37,7 @@ RSpec.shared_examples 'updating mentions' do |service_class|
         update_mentionable(description: "For #{mentioned_user.to_reference}")
       end
 
-      it 'emails only the newly-mentioned user' do
+      it 'emails only the newly-mentioned user', :sidekiq_might_not_need_inline do
         should_only_email(mentioned_user)
       end
     end
@@ -51,7 +51,7 @@ RSpec.shared_examples 'updating mentions' do |service_class|
         )
       end
 
-      it 'emails group members' do
+      it 'emails group members', :sidekiq_might_not_need_inline do
         should_email(mentioned_user)
         should_email(group_member1)
         should_email(group_member2)
@@ -81,7 +81,7 @@ RSpec.shared_examples 'updating mentions' do |service_class|
         )
       end
 
-      it 'emails mentioned user' do
+      it 'emails mentioned user', :sidekiq_might_not_need_inline do
         should_only_email(mentioned_user)
       end
     end