diff --git a/src/cmd/cgo/internal/testout/out_test.go b/src/cmd/cgo/internal/testout/out_test.go
index 81dfa365871372..e8ea5092a3562b 100644
--- a/src/cmd/cgo/internal/testout/out_test.go
+++ b/src/cmd/cgo/internal/testout/out_test.go
@@ -8,8 +8,8 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
-	"internal/testenv"
 	"internal/goarch"
+	"internal/testenv"
 	"os"
 	"path/filepath"
 	"regexp"
diff --git a/src/runtime/os_linux_settime32.go b/src/runtime/os_linux_settime32.go
index 6df7f21dc9ce71..30f95455bfe2ad 100644
--- a/src/runtime/os_linux_settime32.go
+++ b/src/runtime/os_linux_settime32.go
@@ -27,8 +27,8 @@ func timer_settime(timerid int32, flags int32, new, old *itimerspec) int32 {
 		timer32bitOnly.Store(true)
 	}
 
-	var newts,oldts itimerspec32
-	var new32,old32 *itimerspec32
+	var newts, oldts itimerspec32
+	var new32, old32 *itimerspec32
 
 	if new != nil {
 		newts.it_interval.setNsec(new.it_interval.tv_sec*1e9 + new.it_interval.tv_nsec)
diff --git a/src/testing/fstest/testfs_test.go b/src/testing/fstest/testfs_test.go
index e3d7f1ab44d7b7..a0561b6dfc661c 100644
--- a/src/testing/fstest/testfs_test.go
+++ b/src/testing/fstest/testfs_test.go
@@ -105,7 +105,7 @@ func TestTestFSWrappedErrors(t *testing.T) {
 
 	// TestFS is expected to return a list of errors.
 	// Enforce that the list can be extracted for browsing.
-	type wrapper interface{
+	type wrapper interface {
 		error
 		Unwrap() []error
 	}