diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature
index 2c6c1ef..9669056 100644
--- a/features/project/forked_merge_requests.feature
+++ b/features/project/forked_merge_requests.feature
@@ -4,15 +4,6 @@ Feature: Project Forked Merge Requests
     And I am a member of project "Shop"
     And I have a project forked off of "Shop" called "Forked Shop"
 
-  # TODO: fix
-  #@javascript
-  #Scenario: I can visit the target projects commit for a forked merge request
-    #Given I visit project "Forked Shop" merge requests page
-    #And I click link "New Merge Request"
-    #And I fill out a "Merge Request On Forked Project" merge request
-    #And I follow the target commit link
-    #Then I should see the commit under the forked from project
-
   @javascript
   Scenario: I submit new unassigned merge request to a forked project
     Given I visit project "Forked Shop" merge requests page
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index d6ef384..022188f 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -54,20 +54,3 @@ Feature: Project Issues
     And I fill in issue search with "0.3"
     Then I should see "Release 0.3" in issues
     And I should not see "Release 0.4" in issues
-
-  # Disable this two cause of random failing
-  # TODO: fix after v4.0 released
-  #@javascript
-  #Scenario: I create Issue with pre-selected milestone
-    #Given project "Shop" has milestone "v2.2"
-    #And project "Shop" has milestone "v3.0"
-    #And I visit project "Shop" issues page
-    #When I select milestone "v3.0"
-    #And I click link "New Issue"
-    #Then I should see selected milestone with title "v3.0"
-
-  #@javascript
-  #Scenario: I create Issue with pre-selected assignee
-    #When I select first assignee from "Shop" project
-    #And I click link "New Issue"
-    #Then I should see first assignee from "Shop" as selected assignee
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 16bdaf0..ba580d9 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -206,17 +206,6 @@ describe "On a merge request diff", js: true, focus: true do
           find(".js-note-preview-button").trigger("click")
         end
       end
-
-      # TODO: fix
-      #it 'should check if previews were rendered separately' do
-      #within("tr[id='4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185'] + .js-temp-notes-holder") do
-      #should have_css(".js-note-preview", text: "One comment on line 185")
-      #end
-
-      #within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .js-temp-notes-holder") do
-      #should have_css(".js-note-preview", text: "Another comment on line 17")
-      #end
-      #end
     end
 
     describe "posting a note" do
@@ -239,42 +228,8 @@ describe "On a merge request diff", js: true, focus: true do
         should have_css(".notes_holder .note", count: 1)
         should have_link("Reply")
       end
-
-      # TODO: fix
-      #it "should remove last note of a discussion" do
-      # within("tr[id='342e16cbbd482ac2047dc679b2749d248cc1428f_18_17'] + .notes-holder") do
-      #   find(".js-note-delete").click
-      # end
-      # should_not have_css(".note_holder")
-      #end
     end
   end
-
-  # TODO: fix
-  #describe "when replying to a note" do
-  #before do
-  ## create first note
-  # find('a[data-line-code="4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184"]').click
-
-  # within(".js-temp-notes-holder") do
-  # fill_in "note[note]", with: "One comment on line 184"
-  # click_button("Add Comment")
-  #end
-
-  # within(".js-temp-notes-holder") do
-  # find(".js-discussion-reply-button").click
-  # fill_in "note[note]", with: "An additional comment in reply"
-  # click_button("Add Comment")
-  # end
-  #end
-
-  #it 'should be inserted and form removed from reply' do
-  # should have_content("An additional comment in reply")
-  # within(".notes_holder") { should have_css(".note", count: 2) }
-  # within(".notes_holder") { should have_no_css("form") }
-  # within(".notes_holder") { should have_link("Reply") }
-  # end
-  #end
 end
 
 describe "On merge request discussion", js: true do
--
libgit2 0.21.2