You could actually just replay that commit, probably.  Should merge cleanly.  And since the subject test class is full of integration tests anyway, this fits there (though my one little "test resource failure" test should probably be moved to your test class here.)