diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 06b7b78e64..994a475dd9 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -386,36 +386,6 @@ RSpec.describe Account do
     end
   end
 
-  describe '.following_map' do
-    it 'returns an hash' do
-      expect(described_class.following_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.followed_by_map' do
-    it 'returns an hash' do
-      expect(described_class.followed_by_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.blocking_map' do
-    it 'returns an hash' do
-      expect(described_class.blocking_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.requested_map' do
-    it 'returns an hash' do
-      expect(described_class.requested_map([], 1)).to be_a Hash
-    end
-  end
-
-  describe '.requested_by_map' do
-    it 'returns an hash' do
-      expect(described_class.requested_by_map([], 1)).to be_a Hash
-    end
-  end
-
   describe 'MENTION_RE' do
     subject { described_class::MENTION_RE }
 
diff --git a/spec/models/concerns/account/mappings_spec.rb b/spec/models/concerns/account/mappings_spec.rb
index 82d711bf26..18c936b892 100644
--- a/spec/models/concerns/account/mappings_spec.rb
+++ b/spec/models/concerns/account/mappings_spec.rb
@@ -22,6 +22,13 @@ RSpec.describe Account::Mappings do
     context 'when Account is without Follow' do
       it { is_expected.to eq({}) }
     end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
   end
 
   describe '.followed_by_map' do
@@ -36,6 +43,13 @@ RSpec.describe Account::Mappings do
     context 'when Account is without Follow' do
       it { is_expected.to eq({}) }
     end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
   end
 
   describe '.blocking_map' do
@@ -50,6 +64,24 @@ RSpec.describe Account::Mappings do
     context 'when Account is without Block' do
       it { is_expected.to eq({}) }
     end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.blocked_by_map' do
+    subject { Account.blocked_by_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
   end
 
   describe '.muting_map' do
@@ -74,5 +106,56 @@ RSpec.describe Account::Mappings do
     context 'when Account without Mute' do
       it { is_expected.to eq({}) }
     end
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.requested_map' do
+    subject { Account.requested_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.requested_by_map' do
+    subject { Account.requested_by_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.endorsed_map' do
+    subject { Account.endorsed_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
+  end
+
+  describe '.account_note_map' do
+    subject { Account.account_note_map(target_account_ids, account_id) }
+
+    context 'when given empty values' do
+      let(:target_account_ids) { [] }
+      let(:account_id) { 1 }
+
+      it { is_expected.to be_a(Hash) }
+    end
   end
 end