diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb
deleted file mode 100644
index dd139de931..0000000000
--- a/spec/controllers/emojis_controller_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe EmojisController do
-  render_views
-
-  let(:emoji) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
-
-  describe 'GET #show' do
-    let(:response) { get :show, params: { id: emoji.id, format: :json } }
-
-    it 'returns the right response' do
-      expect(response).to have_http_status 200
-      expect(body_as_json[:name]).to eq ':coolcat:'
-    end
-  end
-end
diff --git a/spec/requests/emojis_spec.rb b/spec/requests/emojis_spec.rb
new file mode 100644
index 0000000000..458d500762
--- /dev/null
+++ b/spec/requests/emojis_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Emojis' do
+  describe 'GET /emojis/:id' do
+    let(:emoji) { Fabricate(:custom_emoji, shortcode: 'coolcat') }
+
+    it 'returns http success with correct json' do
+      get "/emojis/#{emoji.id}"
+
+      expect(response)
+        .to have_http_status(200)
+      expect(body_as_json)
+        .to include(
+          name: ':coolcat:',
+          type: 'Emoji'
+        )
+    end
+  end
+end