diff --git a/agent/agentcontext/drpc_test.go b/agent/agentcontext/drpc_test.go
index edab532f7b..ba25020750 100644
--- a/agent/agentcontext/drpc_test.go
+++ b/agent/agentcontext/drpc_test.go
@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-
 	"storj.io/drpc/drpcerr"
 
 	"github.com/coder/coder/v2/agent/agentcontext"
diff --git a/agent/agentcontext/watch.go b/agent/agentcontext/watch.go
index 02118fbe91..a5b6c1d318 100644
--- a/agent/agentcontext/watch.go
+++ b/agent/agentcontext/watch.go
@@ -292,8 +292,8 @@ func (*Watcher) collectDirs(roots []ScanRoot) map[string]struct{} {
 		if err != nil {
 			// Watch the deepest existing ancestor so the
 			// root being created later still fires.
-			if anc := existingAncestor(root.Path); anc != "" {
-				out[anc] = struct{}{}
+			if ancestor := existingAncestor(root.Path); ancestor != "" {
+				out[ancestor] = struct{}{}
 			}
 			continue
 		}
diff --git a/agent/agentcontext/watch_test.go b/agent/agentcontext/watch_test.go
index f46a47b753..ba7d7968e3 100644
--- a/agent/agentcontext/watch_test.go
+++ b/agent/agentcontext/watch_test.go
@@ -10,10 +10,9 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/quartz"
-
 	"github.com/coder/coder/v2/agent/agentcontext"
 	"github.com/coder/coder/v2/testutil"
+	"github.com/coder/quartz"
 )
 
 func TestWatcher_FiresOnAgentsMdEdit(t *testing.T) {