diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1df5c3a66c2..ef2d21eb543 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-15  Matthias Klose  <doko@ubuntu.com>
+
+	* go.test/go-test.exp: Set goarch for aarch64*-*-*.
+
 2014-01-15  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/59822
diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index f1eed08bd3e..1bbbd8742e2 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -187,6 +187,9 @@ proc go-set-goarch { } {
     global target_triplet
 
     switch -glob $target_triplet {
+	"aarch64*-*-*" {
+	    set goarch "arm64"
+	}
 	"alpha*-*-*" {
 	    set goarch "alpha"
 	}