diff --git a/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go b/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go
index 30990642aed3..3293fe44a51e 100644
--- a/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go
+++ b/sdks/go/pkg/beam/core/runtime/exec/sideinput_test.go
@@ -67,26 +67,26 @@ func TestNewSideInputAdapter(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-				adapter := NewSideInputAdapter(test.sid, test.sideInputID, test.c, nil)
-				adapterStruct, ok := adapter.(*sideInputAdapter)
-				if !ok {
-					t.Errorf("failed to convert interface to sideInputAdapter struct in test %v", test)
-				}
-				if got, want := adapterStruct.sid, test.sid; got != want {
-					t.Errorf("got SID %v, want %v", got, want)
-				}
-				if got, want := adapterStruct.sideInputID, test.sideInputID; got != want {
-					t.Errorf("got sideInputID %v, want %v", got, want)
-				}
-				if got, want := adapterStruct.c, test.c; got != want {
-					t.Errorf("got coder %v, want %v", got, want)
-				}
-				if got, want := reflect.TypeOf(adapterStruct.kc), reflect.TypeOf(test.kc); got != want {
-					t.Errorf("got ElementEncoder type %v, want %v", got, want)
-				}
-				if got, want := reflect.TypeOf(adapterStruct.ec), reflect.TypeOf(test.ec); got != want {
-					t.Errorf("got ElementDecoder type %v, want %v", got, want)
-				}
+			adapter := NewSideInputAdapter(test.sid, test.sideInputID, test.c, nil)
+			adapterStruct, ok := adapter.(*sideInputAdapter)
+			if !ok {
+				t.Errorf("failed to convert interface to sideInputAdapter struct in test %v", test)
+			}
+			if got, want := adapterStruct.sid, test.sid; got != want {
+				t.Errorf("got SID %v, want %v", got, want)
+			}
+			if got, want := adapterStruct.sideInputID, test.sideInputID; got != want {
+				t.Errorf("got sideInputID %v, want %v", got, want)
+			}
+			if got, want := adapterStruct.c, test.c; got != want {
+				t.Errorf("got coder %v, want %v", got, want)
+			}
+			if got, want := reflect.TypeOf(adapterStruct.kc), reflect.TypeOf(test.kc); got != want {
+				t.Errorf("got ElementEncoder type %v, want %v", got, want)
+			}
+			if got, want := reflect.TypeOf(adapterStruct.ec), reflect.TypeOf(test.ec); got != want {
+				t.Errorf("got ElementDecoder type %v, want %v", got, want)
+			}
 		})
 	}
 }
diff --git a/sdks/go/pkg/beam/util/harnessopts/cache.go b/sdks/go/pkg/beam/util/harnessopts/cache.go
index 117f45f00825..2ad538b73af2 100644
--- a/sdks/go/pkg/beam/util/harnessopts/cache.go
+++ b/sdks/go/pkg/beam/util/harnessopts/cache.go
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package harnessopts defines user-facing entrypoints into Beam hooks 
+// Package harnessopts defines user-facing entrypoints into Beam hooks
 // affecting the SDK harness. Call these functions at any time before
 // submitting your pipeline to a runner, for that pipeline's workers to be affected.
 package harnessopts
diff --git a/sdks/go/pkg/beam/util/syscallx/syscall_default.go b/sdks/go/pkg/beam/util/syscallx/syscall_default.go
index a85cd3f0e7e2..55756d0dbd44 100644
--- a/sdks/go/pkg/beam/util/syscallx/syscall_default.go
+++ b/sdks/go/pkg/beam/util/syscallx/syscall_default.go
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !linux
 // +build !linux
 
 package syscallx
diff --git a/sdks/go/pkg/beam/util/syscallx/syscall_linux.go b/sdks/go/pkg/beam/util/syscallx/syscall_linux.go
index c639f876bebc..379437ad0a17 100644
--- a/sdks/go/pkg/beam/util/syscallx/syscall_linux.go
+++ b/sdks/go/pkg/beam/util/syscallx/syscall_linux.go
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package syscallx