diff --git a/pkg/golinters/govet/testdata/govet_fieldalignment.go b/pkg/golinters/govet/testdata/govet_fieldalignment.go
index e29be101eb7c..315ab8a1b1fc 100644
--- a/pkg/golinters/govet/testdata/govet_fieldalignment.go
+++ b/pkg/golinters/govet/testdata/govet_fieldalignment.go
@@ -1,3 +1,4 @@
+//go:build !(386 || arm || mips || mipsle)
 //golangcitest:args -Egovet
 //golangcitest:config_path testdata/govet_fieldalignment.yml
 package testdata
diff --git a/test/testshared/directives.go b/test/testshared/directives.go
index 2881816bb496..c3f97afc08e6 100644
--- a/test/testshared/directives.go
+++ b/test/testshared/directives.go
@@ -136,6 +136,10 @@ func evaluateBuildTags(tb testing.TB, line string) bool {
 			return true
 		}
 
+		if tag == runtime.GOARCH {
+			return true
+		}
+
 		if buildTagGoVersion(tag) {
 			return true
 		}