--- a/test/jtreg-ext/requires/VMProps.java	Mon Mar 05 13:10:31 2018 -0800
+++ b/test/jtreg-ext/requires/VMProps.java	Sat Mar 03 10:15:23 2018 +0000
@@ -366,18 +366,34 @@
      * @return true if docker is supported in a given environment
      */
     protected String dockerSupport() {
-        // currently docker testing is only supported for Linux-x64, Linux-s390x and Linux-ppc64le
-        String arch = System.getProperty("os.arch");
-        if (! (Platform.isLinux() && (Platform.isX64() || Platform.isS390x() || arch.equals("ppc64le")))) {
-            return "false";
+        boolean isSupported = false;
+        if (Platform.isLinux()) {
+           // currently docker testing is only supported for Linux,
+           // on certain platforms
+
+           String arch = System.getProperty("os.arch");
+
+           if (Platform.isX64()) {
+              isSupported = true;
+           }
+           else if (Platform.isAArch64()) {
+              isSupported = true;
+           }
+           else if (Platform.isS390x()) {
+              isSupported = true;
+           }
+           else if (arch.equals("ppc64le")) {
+              isSupported = true;
+           }
         }
 
-        boolean isSupported;
-        try {
-            isSupported = checkDockerSupport();
-        } catch (Exception e) {
-            isSupported = false;
-        }
+        if (isSupported) {
+           try {
+              isSupported = checkDockerSupport();
+           } catch (Exception e) {
+              isSupported = false;
+           }
+         }
 
         return (isSupported) ? "true" : "false";
     }