diff --git a/spec/controllers/admin/emojis_controller_spec.rb b/spec/controllers/admin/emojis_controller_spec.rb
deleted file mode 100644
index 5faafdfeb34..00000000000
--- a/spec/controllers/admin/emojis_controller_spec.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require "rails_helper"
-
-describe Admin::EmojisController do
-
-  let(:custom_emoji) do
-    Emoji.new("/path/to/hello").tap do |e|
-      e.name = "hello"
-      e.url = "/url/to/hello.png"
-    end
-  end
-
-  let(:custom_emoji2) do
-    Emoji.new("/path/to/hello2").tap do |e|
-      e.name = "hello2"
-      e.url = "/url/to/hello2.png"
-    end
-  end
-
-  context "when logged in" do
-    let!(:user) { log_in(:admin) }
-
-    context ".index" do
-      it "returns a list of custom emojis" do
-        Emoji.expects(:custom).returns([custom_emoji])
-        get :index, format: :json
-        expect(response.status).to eq(200)
-        json = ::JSON.parse(response.body)
-        expect(json[0]["name"]).to eq(custom_emoji.name)
-        expect(json[0]["url"]).to eq(custom_emoji.url)
-      end
-    end
-  end
-
-end
diff --git a/spec/requests/admin/emojis_controller_spec.rb b/spec/requests/admin/emojis_controller_spec.rb
index 3d781af215c..24019fc343a 100644
--- a/spec/requests/admin/emojis_controller_spec.rb
+++ b/spec/requests/admin/emojis_controller_spec.rb
@@ -8,6 +8,20 @@ RSpec.describe Admin::EmojisController do
     sign_in(admin)
   end
 
+  describe '#index' do
+    it "returns a list of custom emojis" do
+      CustomEmoji.create!(name: 'osama-test-emoji', upload: upload)
+      Emoji.clear_cache
+
+      get "/admin/customize/emojis.json"
+      expect(response.status).to eq(200)
+
+      json = ::JSON.parse(response.body)
+      expect(json[0]["name"]).to eq("osama-test-emoji")
+      expect(json[0]["url"]).to eq(upload.url)
+    end
+  end
+
   describe "#create" do
     describe 'when upload is invalid' do
       it 'should publish the right error' do