diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index 38149ab7b..acf902186 100644
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -64,7 +64,7 @@ class NotesControllerTest < ActionController::TestCase
 
         assert_equal(@note_text, @edition.important_note.comment)
         assert_redirected_to history_edition_path(@edition)
-        assert_includes flash[:success], "Note recorded"
+        assert_equal "Note recorded", flash[:success]
       end
 
       should "show 'Note resolved' if a parent note exists and then an empty note is saved" do
@@ -91,7 +91,7 @@ class NotesControllerTest < ActionController::TestCase
 
         assert_nil(@edition.important_note)
         assert_redirected_to history_edition_path(@edition)
-        assert_includes flash[:success], "Note resolved"
+        assert_equal "Note resolved", flash[:success]
       end
 
       should "show no flash message if no parent note exists and then an empty note is saved" do
@@ -124,7 +124,7 @@ class NotesControllerTest < ActionController::TestCase
         @edition.reload
 
         assert_redirected_to history_update_important_note_edition_path(@edition)
-        assert_includes flash[:danger], "Note failed to save"
+        assert_equal "Note failed to save", flash[:danger]
       end
     end
 
diff --git a/test/integration/edition_edit_test.rb b/test/integration/edition_edit_test.rb
index 99894c58f..6577e095b 100644
--- a/test/integration/edition_edit_test.rb
+++ b/test/integration/edition_edit_test.rb
@@ -249,9 +249,7 @@ class EditionEditTest < IntegrationTest
       # New asserts go here
     end
 
-    # TODO: Test to be switched on when the "Create new edition" functionality has been implemented.
     should "not be carried forward to new editions" do
-      skip "Until this functionality is complete: #601 - Edit page for Published edition (answer and help)"
       note_text = "This important note should not appear on a new edition."
       create_published_edition
       create_important_note_for_edition(@published_edition, note_text)