--- a/hotspot/test/test_env.sh	Tue Jul 18 10:39:10 2017 -0700
+++ b/hotspot/test/test_env.sh	Thu Aug 24 16:31:05 2017 +0200
@@ -214,6 +214,11 @@
 then
   VM_CPU="aarch64"
 fi
+grep "arm64" 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}"