diff --git a/features/steps/shared/diff_note.rb b/features/steps/shared/diff_note.rb
index 7f1dde16c171b51763fce843754ca3b4afb56a0d..28964d54a8f5762e40022cd5008af7937a4cbc03 100644
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -132,26 +132,26 @@ module SharedDiffNote
 
   step 'I should see the diff comment preview' do
     within("#{diff_file_selector} form") do
-      expect(page).to have_css('.js-md-preview')
+      expect(page).to have_css('.js-md-preview', visible: true)
     end
   end
 
   step 'I should see the diff comment write tab' do
     within(diff_file_selector) do
-      expect(page).to have_css('.js-md-write-button')
+      expect(page).to have_css('.js-md-write-button', visible: true)
     end
   end
 
   step 'The diff comment preview tab should display rendered Markdown' do
     within(diff_file_selector) do
       find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_css('img.emoji')
+      expect(find('.js-md-preview')).to have_css('img.emoji', visible: true)
     end
   end
 
   step 'I should see two separate previews' do
     within(diff_file_selector) do
-      expect(page).to have_css('.js-md-preview', count: 2)
+      expect(page).to have_css('.js-md-preview', visible: true, count: 2)
       expect(page).to have_content('Should fix it')
       expect(page).to have_content('DRY this up')
     end
diff --git a/features/steps/shared/markdown.rb b/features/steps/shared/markdown.rb
index 8dfb8ed72e9cfbd7ffd80b965387045cc6db62fc..e71700880cde96622a3a307ad47e79deaba25e80 100644
--- a/features/steps/shared/markdown.rb
+++ b/features/steps/shared/markdown.rb
@@ -56,7 +56,7 @@ EOT
   end
 
   step 'I should not see the Markdown preview' do
-    expect(find('.gfm-form')).not_to have_css('.js-md-preview', visible: true)
+    expect(find('.gfm-form .js-md-preview')).not_to be_visible
   end
 
   step 'The Markdown preview tab should say there is nothing to do' do
@@ -67,21 +67,21 @@ EOT
   end
 
   step 'I should not see the Markdown text field' do
-    expect(find('.gfm-form')).not_to have_css('textarea', visible: true)
+    expect(find('.gfm-form textarea')).not_to be_visible
   end
 
   step 'I should see the Markdown write tab' do
-    expect(find('.gfm-form')).to have_css('.js-md-write-button')
+    expect(find('.gfm-form')).to have_css('.js-md-write-button', visible: true)
   end
 
   step 'I should see the Markdown preview' do
-    expect(find('.gfm-form')).to have_css('.js-md-preview')
+    expect(find('.gfm-form')).to have_css('.js-md-preview', visible: true)
   end
 
   step 'The Markdown preview tab should display rendered Markdown' do
     within('.gfm-form') do
       find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_css('img.emoji')
+      expect(find('.js-md-preview')).to have_css('img.emoji', visible: true)
     end
   end
 
diff --git a/features/steps/shared/note.rb b/features/steps/shared/note.rb
index 52d8c7e50fa01958cf152088c056426189d908e1..17adec3eda1e62c25fcc31f09523c19532d68642 100644
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -51,7 +51,7 @@ module SharedNote
 
   step 'I should not see the comment preview' do
     within(".js-main-target-form") do
-      expect(page).not_to have_css('.js-md-preview', visible: true)
+      expect(find('.js-md-preview')).not_to be_visible
     end
   end
 
@@ -82,20 +82,20 @@ module SharedNote
 
   step 'I should see the comment write tab' do
     within(".js-main-target-form") do
-      expect(page).to have_css('.js-md-write-button')
+      expect(page).to have_css('.js-md-write-button', visible: true)
     end
   end
 
   step 'The comment preview tab should be display rendered Markdown' do
     within(".js-main-target-form") do
       find('.js-md-preview-button').click
-      expect(find('.js-md-preview')).to have_css('img.emoji')
+      expect(find('.js-md-preview')).to have_css('img.emoji', visible: true)
     end
   end
 
   step 'I should see the comment preview' do
     within(".js-main-target-form") do
-      expect(page).to have_css('.js-md-preview')
+      expect(page).to have_css('.js-md-preview', visible: true)
     end
   end
 
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 6d3cc3ae1591147b9bfab3866a5d661842cea441..cac409b9139ebb737020ccc44890f1fef18b0d3c 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -34,7 +34,7 @@ describe 'Comments' do
         it 'should have enable submit button and preview button' do
           within('.js-main-target-form') do
             expect(page).not_to have_css('.js-comment-button[disabled]')
-            expect(page).to have_css('.js-md-preview-button')
+            expect(page).to have_css('.js-md-preview-button', visible: true)
           end
         end
       end
@@ -53,7 +53,7 @@ describe 'Comments' do
         should have_content("This is awsome!")
         within('.js-main-target-form') do
           expect(page).to have_no_field('note[note]', with: 'This is awesome!')
-          expect(page).not_to have_css('.js-md-preview', visible: true)
+          expect(page).to have_css('.js-md-preview', visible: :hidden)
         end
         within(".js-main-target-form") { should have_css(".js-note-text", visible: true) }
       end