diff --git a/util/dirwatch/dirwatch.go b/util/dirwatch/dirwatch.go
index b01e5630..cbe2026a 100644
--- a/util/dirwatch/dirwatch.go
+++ b/util/dirwatch/dirwatch.go
@@ -9,9 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"bitbucket.org/anacrolix/go.torrent/util"
-
 	"bitbucket.org/anacrolix/go.torrent"
+	"bitbucket.org/anacrolix/go.torrent/util"
 	"github.com/anacrolix/libtorgo/metainfo"
 	"github.com/go-fsnotify/fsnotify"
 )
diff --git a/util/dirwatch/dirwatch_test.go b/util/dirwatch/dirwatch_test.go
index 7a975702..40d68ff7 100644
--- a/util/dirwatch/dirwatch_test.go
+++ b/util/dirwatch/dirwatch_test.go
@@ -12,9 +12,10 @@ func TestDirwatch(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer os.RemoveAll(tempDirName)
+	t.Logf("tempdir: %q", tempDirName)
 	dw, err := New(tempDirName)
+	defer dw.Close()
 	if err != nil {
 		t.Fatal(err)
 	}
-	dw.Close()
 }