diff --git a/test/nilptr3.go b/test/nilptr3.go
index cf26993ef9..a62b262407 100644
--- a/test/nilptr3.go
+++ b/test/nilptr3.go
@@ -1,6 +1,7 @@
 // errorcheck -0 -d=nil
-// Fails on ppc64x because of incomplete optimization.  See issue 9058.
-// +build !ppc64,!ppc64le
+// Fails on ppc64x and arm64 because of incomplete optimization.
+// See issues 9058 and 10105.
+// +build !ppc64,!ppc64le,!arm64
 
 // Copyright 2013 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/nosplit.go b/test/nosplit.go
index 0bd13c1db4..bd4e60bc13 100644
--- a/test/nosplit.go
+++ b/test/nosplit.go
@@ -261,6 +261,9 @@ TestCases:
 			fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (CTR)\n#define RET RETURN\n")
 		case "arm":
 			fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (R0)\n")
+		case "arm64":
+			ptrSize = 8
+			fmt.Fprintf(&buf, "#define CALL BL\n#define REGISTER (R0)\n")
 		case "amd64":
 			ptrSize = 8
 			fmt.Fprintf(&buf, "#define REGISTER AX\n")