--- a/hotspot/test/test_env.sh	Tue May 19 16:05:12 2015 +0200
+++ b/hotspot/test/test_env.sh	Wed May 20 09:07:36 2015 -0400
@@ -198,6 +198,11 @@
 then
   VM_CPU="ia64"
 fi
+grep "aarch64" vm_version.out > ${NULL}
+if [ $? = 0 ]
+then
+  VM_CPU="aarch64"
+fi
 export VM_TYPE VM_BITS VM_OS VM_CPU
 echo "VM_TYPE=${VM_TYPE}"
 echo "VM_BITS=${VM_BITS}"