diff --git a/inotify_poller_test.go b/inotify_poller_test.go
index c7475454..0570057b 100644
--- a/inotify_poller_test.go
+++ b/inotify_poller_test.go
@@ -174,19 +174,19 @@ func TestPollerConcurrent(t *testing.T) {
 	oks := make(chan bool)
 	live := make(chan bool)
 	defer close(live)
-	go func() {
+	go func(tb testing.TB) {
 		defer close(oks)
 		for {
 			ok, err := poller.wait()
 			if err != nil {
-				t.Fatalf("poller failed: %v", err)
+				tb.Fatalf("poller failed: %v", err)
 			}
 			oks <- ok
 			if !<-live {
 				return
 			}
 		}
-	}()
+	}(t)
 
 	// Try a write
 	select {
diff --git a/inotify_test.go b/inotify_test.go
index 90c82b8e..e427c54a 100644
--- a/inotify_test.go
+++ b/inotify_test.go
@@ -336,11 +336,11 @@ func TestInotifyInnerMapLength(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to add testFile: %v", err)
 	}
-	go func() {
+	go func(tb testing.TB) {
 		for err := range w.Errors {
-			t.Fatalf("error received: %s", err)
+			tb.Fatalf("error received: %s", err)
 		}
-	}()
+	}(t)
 
 	err = os.Remove(testFile)
 	if err != nil {
diff --git a/integration_test.go b/integration_test.go
index fc09e03f..754e00e3 100644
--- a/integration_test.go
+++ b/integration_test.go
@@ -75,11 +75,11 @@ func TestFsnotifyMultipleOperations(t *testing.T) {
 	watcher := newWatcher(t)
 
 	// Receive errors on the error channel on a separate goroutine
-	go func() {
+	go func(tb testing.TB) {
 		for err := range watcher.Errors {
-			t.Fatalf("error received: %s", err)
+			tb.Fatalf("error received: %s", err)
 		}
-	}()
+	}(t)
 
 	// Create directory to watch
 	testDir := tempMkdir(t)
@@ -837,14 +837,14 @@ func TestRemovalOfWatch(t *testing.T) {
 		t.Fatalf("Could not remove the watch: %v\n", err)
 	}
 
-	go func() {
+	go func(tb testing.TB) {
 		select {
 		case ev := <-watcher.Events:
-			t.Fatalf("We received event: %v\n", ev)
+			tb.Fatalf("We received event: %v\n", ev)
 		case <-time.After(500 * time.Millisecond):
-			t.Log("No event received, as expected.")
+			tb.Log("No event received, as expected.")
 		}
-	}()
+	}(t)
 
 	time.Sleep(200 * time.Millisecond)
 	// Modify the file outside of the watched dir