---
 tail_test.go |   28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

--- a/tail_test.go
+++ b/tail_test.go
@@ -345,19 +345,11 @@ func reOpen(t *testing.T, poll bool) {
 	content := []string{"hello", "world", "more", "data", "endofworld"}
 	go tailTest.VerifyTailOutput(tail, content, false)
 
-	if poll {
-		// deletion must trigger reopen
-		<-time.After(delay)
-		tailTest.RemoveFile("test.txt")
-		<-time.After(delay)
-		tailTest.CreateFile("test.txt", "more\ndata\n")
-	} else {
-		// In inotify mode, fsnotify is currently unable to deliver notifications
-		// about deletion of open files, so we are not testing file deletion.
-		// (see https://github.com/fsnotify/fsnotify/issues/194 for details).
-		<-time.After(delay)
-		tailTest.AppendToFile("test.txt", "more\ndata\n")
-	}
+	// deletion must trigger reopen
+	<-time.After(delay)
+	tailTest.RemoveFile("test.txt")
+	<-time.After(delay)
+	tailTest.CreateFile("test.txt", "more\ndata\n")
 
 	// rename must trigger reopen
 	<-time.After(delay)
@@ -371,10 +363,7 @@ func reOpen(t *testing.T, poll bool) {
 	tailTest.RemoveFile("test.txt")
 	<-time.After(delay)
 
-	// Do not bother with stopping as it could kill the tomb during
-	// the reading of data written above. Timings can vary based on
-	// test environment.
-	tailTest.Cleanup(tail, false)
+	tail.Cleanup()
 }
 
 func TestInotify_WaitForCreateThenMove(t *testing.T) {
@@ -429,10 +418,7 @@ func reSeek(t *testing.T, poll bool) {
 	<-time.After(100 * time.Millisecond)
 	tailTest.RemoveFile("test.txt")
 
-	// Do not bother with stopping as it could kill the tomb during
-	// the reading of data written above. Timings can vary based on
-	// test environment.
-	tailTest.Cleanup(tail, false)
+	tail.Cleanup()
 }
 
 // Test library