diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb
deleted file mode 100644
index efd15b5b40..0000000000
--- a/spec/controllers/media_controller_spec.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe MediaController do
-  render_views
-
-  describe '#show' do
-    it 'raises when shortcode cant be found' do
-      get :show, params: { id: 'missing' }
-
-      expect(response).to have_http_status(404)
-    end
-
-    context 'when the media attachment has a shortcode' do
-      it 'redirects to the file url when attached to a status' do
-        status = Fabricate(:status)
-        media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to redirect_to(media_attachment.file.url(:original))
-      end
-
-      it 'responds with missing when there is not an attached status' do
-        media_attachment = Fabricate(:media_attachment, status: nil, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-
-      it 'raises when not permitted to view' do
-        status = Fabricate(:status, visibility: :direct)
-        media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    context 'when the media attachment has no shortcode' do
-      it 'redirects to the file url when attached to a status' do
-        status = Fabricate(:status)
-        media_attachment = Fabricate(:media_attachment, status: status)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to redirect_to(media_attachment.file.url(:original))
-      end
-
-      it 'responds with missing when there is not an attached status' do
-        media_attachment = Fabricate(:media_attachment, status: nil)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-
-      it 'raises when not permitted to view' do
-        status = Fabricate(:status, visibility: :direct)
-        media_attachment = Fabricate(:media_attachment, status: status)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-    end
-  end
-end
diff --git a/spec/requests/media_spec.rb b/spec/requests/media_spec.rb
new file mode 100644
index 0000000000..a448a87492
--- /dev/null
+++ b/spec/requests/media_spec.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Media' do
+  describe 'GET /media/:id' do
+    context 'when the media attachment does not exist' do
+      it 'responds with not found' do
+        get '/media/missing'
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'when the media attachment has a shortcode' do
+      let(:media_attachment) { Fabricate :media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994' }
+
+      context 'when attached to a status' do
+        let(:status) { Fabricate :status }
+
+        it 'redirects to file url' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to redirect_to(media_attachment.file.url(:original))
+        end
+      end
+
+      context 'when not attached to a status' do
+        let(:status) { nil }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+
+      context 'when attached to non-public status' do
+        let(:status) { Fabricate :status, visibility: :direct }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+    end
+
+    context 'when the media attachment does not have a shortcode' do
+      let(:media_attachment) { Fabricate :media_attachment, status: status, shortcode: nil }
+
+      context 'when attached to a status' do
+        let(:status) { Fabricate :status }
+
+        it 'redirects to file url' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to redirect_to(media_attachment.file.url(:original))
+        end
+      end
+
+      context 'when not attached to a status' do
+        let(:status) { nil }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+
+      context 'when attached to non-public status' do
+        let(:status) { Fabricate :status, visibility: :direct }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+    end
+  end
+end