diff --git a/spec/features/projects/commits/note_spec.rb b/spec/features/projects/commits/note_spec.rb
deleted file mode 100644
index bc42b63c37131cc4f6c63f308648116a9b939ba2..0000000000000000000000000000000000000000
--- a/spec/features/projects/commits/note_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe 'Projects > Commits > Note' do
-  let(:project) { create(:project) }
-  let(:commit)  { project.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-    visit namespace_project_commit_path(project.namespace, project, commit.id)
-  end
-
-  it 'says that only markdown is supported, not slash commands' do
-    expect(page).to have_content('Styling with Markdown is supported')
-  end
-end
diff --git a/spec/views/projects/notes/_form.html.haml_spec.rb b/spec/views/projects/notes/_form.html.haml_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..932d6756ad2751aad3befa2e5dd5d680f9fe59fd
--- /dev/null
+++ b/spec/views/projects/notes/_form.html.haml_spec.rb
@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe 'projects/notes/_form' do
+  include Devise::TestHelpers
+
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project) }
+
+  before do
+    project.team << [user, :master]
+    assign(:project, project)
+    assign(:note, note)
+
+    allow(view).to receive(:current_user).and_return(user)
+
+    render
+  end
+
+  %w[issue merge_request].each do |noteable|
+    context "with a note on #{noteable}" do
+      let(:note) { build(:"note_on_#{noteable}", project: project) }
+
+      it 'says that only markdown is supported, not slash commands' do
+        expect(rendered).to have_content('Styling with Markdown and slash commands are supported')
+      end
+    end
+  end
+
+  context 'with a note on a commit' do
+    let(:note) { build(:note_on_commit, project: project) }
+
+    it 'says that only markdown is supported, not slash commands' do
+      expect(rendered).to have_content('Styling with Markdown is supported')
+    end
+  end
+end