diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index bf067cdc38..b8af91aac9 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe 'Accounts show response' do
-  let(:account) { Fabricate(:account) }
+  let_it_be(:account) { Fabricate(:account) }
 
   context 'with an unapproved account' do
     before { account.user.update(approved: false) }
@@ -46,14 +46,14 @@
 
   describe 'GET to short username paths' do
     context 'with existing statuses' do
-      let!(:status) { Fabricate(:status, account: account) }
-      let!(:status_reply) { Fabricate(:status, account: account, thread: Fabricate(:status)) }
-      let!(:status_self_reply) { Fabricate(:status, account: account, thread: status) }
-      let!(:status_media) { Fabricate(:status, account: account) }
-      let!(:status_pinned) { Fabricate(:status, account: account) }
-      let!(:status_private) { Fabricate(:status, account: account, visibility: :private) }
-      let!(:status_direct) { Fabricate(:status, account: account, visibility: :direct) }
-      let!(:status_reblog) { Fabricate(:status, account: account, reblog: Fabricate(:status)) }
+      let_it_be(:status) { Fabricate(:status, account: account) }
+      let_it_be(:status_reply) { Fabricate(:status, account: account, thread: Fabricate(:status)) }
+      let_it_be(:status_self_reply) { Fabricate(:status, account: account, thread: status) }
+      let_it_be(:status_media) { Fabricate(:status, account: account) }
+      let_it_be(:status_pinned) { Fabricate(:status, account: account) }
+      let_it_be(:status_private) { Fabricate(:status, account: account, visibility: :private) }
+      let_it_be(:status_direct) { Fabricate(:status, account: account, visibility: :direct) }
+      let_it_be(:status_reblog) { Fabricate(:status, account: account, reblog: Fabricate(:status)) }
 
       before do
         status_media.media_attachments << Fabricate(:media_attachment, account: account, type: :image)
@@ -99,9 +99,8 @@
         end
 
         context 'with tag' do
-          let(:tag) { Fabricate(:tag) }
-
-          let!(:status_tag) { Fabricate(:status, account: account) }
+          let_it_be(:tag) { Fabricate(:tag) }
+          let_it_be(:status_tag) { Fabricate(:status, account: account) }
 
           before do
             status_tag.tags << tag
@@ -268,9 +267,8 @@
         end
 
         context 'with tag' do
-          let(:tag) { Fabricate(:tag) }
-
-          let!(:status_tag) { Fabricate(:status, account: account) }
+          let_it_be(:tag) { Fabricate(:tag) }
+          let_it_be(:status_tag) { Fabricate(:status, account: account) }
 
           before do
             status_tag.tags << tag