diff --git a/cmd/deflake/main.go b/cmd/deflake/main.go
index 2260197d0..224734fa1 100644
--- a/cmd/deflake/main.go
+++ b/cmd/deflake/main.go
@@ -42,12 +42,12 @@ var (
 	raceFlag     = flag.Bool("race", true, "also run tests with -race")
 	parallelFlag = flag.Int("parallel", runtime.NumCPU(), "number of packages to test in parallel")
 	maxBaseline  = flag.Duration("max-baseline", 60*time.Second, "max baseline time; tests exceeding this are marked as flakes")
-	baselineFile   = flag.String("baseline", "", "path to baseline.json (runs baseline if empty)")
-	csvFile        = flag.String("csv", "", "path to existing tests.csv to resume from")
-	outputFile     = flag.String("output", "tests.csv", "path to output CSV")
-	packagesFlag   = flag.String("packages", "./...", "package pattern to test")
-	flakeLogFile   = flag.String("flake-log", "flakes.log", "path to flake log file")
-	goToolFlag     = flag.String("go", "./tool/go", "path to go command")
+	baselineFile = flag.String("baseline", "", "path to baseline.json (runs baseline if empty)")
+	csvFile      = flag.String("csv", "", "path to existing tests.csv to resume from")
+	outputFile   = flag.String("output", "tests.csv", "path to output CSV")
+	packagesFlag = flag.String("packages", "./...", "package pattern to test")
+	flakeLogFile = flag.String("flake-log", "flakes.log", "path to flake log file")
+	goToolFlag   = flag.String("go", "./tool/go", "path to go command")
 )
 
 // TestEvent represents a single JSON event from go test -json
@@ -62,11 +62,11 @@ type TestEvent struct {
 
 // TestInfo holds baseline info for a test
 type TestInfo struct {
-	Package     string
-	Test        string
-	BaselineMS  float64 // baseline time in milliseconds
-	PassCount   int
-	Status      string // "pending", "pass", "flake", "flake-race"
+	Package    string
+	Test       string
+	BaselineMS float64 // baseline time in milliseconds
+	PassCount  int
+	Status     string // "pending", "pass", "flake", "flake-race"
 }
 
 func main() {
diff --git a/drive/driveimpl/drive_test.go b/drive/driveimpl/drive_test.go
index 2a81e5ae4..6e4e3fd4b 100644
--- a/drive/driveimpl/drive_test.go
+++ b/drive/driveimpl/drive_test.go
@@ -511,10 +511,10 @@ func (s *system) addRemote(name string) string {
 	s.t.Logf("FileServer for %v listening at %s", name, fileServer.Addr())
 
 	r := &remote{
-		l:          ln,
-		fileServer: fileServer,
-		fs:         NewFileSystemForRemote(log.Printf),
-		shares:     make(map[string]string),
+		l:           ln,
+		fileServer:  fileServer,
+		fs:          NewFileSystemForRemote(log.Printf),
+		shares:      make(map[string]string),
 		permissions: make(map[string]drive.Permission),
 	}
 	r.fs.SetFileServerAddr(fileServer.Addr())
diff --git a/ssh/tailssh/tailssh_integration_test.go b/ssh/tailssh/tailssh_integration_test.go
index d49ca8eef..9e54e55a7 100644
--- a/ssh/tailssh/tailssh_integration_test.go
+++ b/ssh/tailssh/tailssh_integration_test.go
@@ -937,8 +937,8 @@ func (tb *testBackend) NetMap() *netmap.NetworkMap {
 						AllowLocalPortForwarding:  tb.allowLocalPortForwarding,
 						AllowRemotePortForwarding: tb.allowRemotePortForwarding,
 					},
-					SSHUsers:   map[string]string{"*": tb.localUser},
-					AcceptEnv:  []string{"GIT_*", "EXACT_MATCH", "TEST?NG"},
+					SSHUsers:  map[string]string{"*": tb.localUser},
+					AcceptEnv: []string{"GIT_*", "EXACT_MATCH", "TEST?NG"},
 				},
 			},
 		},