diff --git a/src/Make.inc b/src/Make.inc
index 3544f26ca40..6af9145f9ef 100644
--- a/src/Make.inc
+++ b/src/Make.inc
@@ -42,7 +42,7 @@ ifeq ($(GOOS),darwin)
 GOARCH:=${shell if sysctl machdep.cpu.extfeatures | grep EM64T >/dev/null; then echo amd64; else uname -m | sed 's/i386/386/'; fi}
 else
 # Ask uname -m for the processor.
-GOARCH:=${shell uname -m | sed 's/^..86$$/386/; s/^.86$$/386/; s/x86_64/amd64/'}
+GOARCH:=${shell uname -m | sed 's/^..86$$/386/; s/^.86$$/386/; s/x86_64/amd64/; s/arm.*/arm/'}
 endif
 endif
 
diff --git a/test/run b/test/run
index f4765d7faef..016094c90af 100755
--- a/test/run
+++ b/test/run
@@ -14,7 +14,7 @@ X386)
 	;;
 Xarm)
 	export A=5
-	export E=${GORUN:-qemu-arm -cpu cortex-a8}
+	export E="$GORUN"
 	;;
 *)
 	echo 1>&2 run: unsupported '$GOARCH'
diff --git a/test/run-arm b/test/run-arm
index a62df10ca4b..b3e3307ed95 100755
--- a/test/run-arm
+++ b/test/run-arm
@@ -13,7 +13,7 @@ X386)
 	;;
 Xarm)
 	export A=5
-	export E="${GORUN:-qemu-arm -cpu cortex-a8}"
+	export E="$GORUN"
 	;;
 *)
 	echo 1>&2 run: unsupported '$GOARCH'