--- old/test/jtreg-ext/requires/VMProps.java	2018-02-18 18:20:57.793043182 +0000
+++ new/test/jtreg-ext/requires/VMProps.java	2018-02-18 18:20:56.973008264 +0000
@@ -366,19 +366,35 @@
      * @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");
 
-        boolean isSupported;
-        try {
-            isSupported = checkDockerSupport();
-        } catch (Exception e) {
-            isSupported = false;
+           if (Platform.isX64()) {
+              isSupported = true;
+           }
+           else if (Platform.isAArch64()) {
+              isSupported = true;
+           }
+           else if (Platform.isS390x()) {
+              isSupported = true;
+           }
+           else if (arch.equals("ppc64le")) {
+              isSupported = true;
+           }
         }
 
+        if (isSupported) {
+           try {
+              isSupported = checkDockerSupport();
+           } catch (Exception e) {
+              isSupported = false;
+           }
+         }
+
         return (isSupported) ? "true" : "false";
     }