--- old/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java	2020-04-13 21:04:13.000000000 -0700
+++ new/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java	2020-04-13 21:04:13.000000000 -0700
@@ -115,7 +115,11 @@
         assertTrue(intfs.length == 1);
         assertTrue(intfs[0] == HiddenTest.class);
         assertTrue(c.getCanonicalName() == null);
-        assertTrue(c.getName().startsWith("HiddenClass/"));
+
+        String hcName = "HiddenClass";
+        String hcSuffix = "0x[0-9a-f]+";
+        assertTrue(c.getName().matches(hcName + "/" + hcSuffix));
+        assertTrue(c.descriptorString().matches("L" + hcName + ";" + "/" + hcSuffix));
 
         // test array of hidden class
         testHiddenArray(c);
@@ -139,7 +143,11 @@
         assertTrue(arrayType.isArray());
         assertTrue(Array.getLength(array) == 2);
         assertFalse(arrayType.isHidden());
-        assertTrue(arrayType.getName().startsWith("[LHiddenClass/"), "unexpected name: " + arrayType.getName());
+
+        String hcName = "HiddenClass";
+        String hcSuffix = "0x[0-9a-f]+";
+        assertTrue(arrayType.getName().matches("\\[" + "L" + hcName + "/" + hcSuffix + ";"));
+        assertTrue(arrayType.descriptorString().matches("\\[" + "L" + hcName + ";" + "/" + hcSuffix));
 
         assertTrue(arrayType.getComponentType().isHidden());
         assertTrue(arrayType.getComponentType() == type);