--- old/test/jdk/TEST.ROOT	2018-04-19 10:04:18.000000000 +0800
+++ new/test/jdk/TEST.ROOT	2018-04-19 10:04:17.000000000 +0800
@@ -17,10 +17,34 @@
 keys=2d dnd headful i18n intermittent printer randomness
 
 # Tests that must run in othervm mode
-othervm.dirs=java/awt java/beans javax/accessibility javax/imageio javax/sound javax/swing javax/print javax/management com/sun/awt sun/awt sun/java2d javax/xml/jaxp/testng/validation java/lang/ProcessHandle
+othervm.dirs= \
+    com/sun/awt \
+    java/awt \
+    java/beans \
+    java/lang/ProcessHandle \
+    javax/accessibility \
+    javax/imageio \
+    javax/management \
+    javax/print \
+    javax/sound \
+    javax/swing \
+    javax/xml/jaxp/testng/validation \
+    sun/awt \
+    sun/java2d
 
 # Tests that cannot run concurrently
-exclusiveAccess.dirs=java/rmi/Naming java/util/prefs sun/management/jmxremote sun/tools/jstatd sun/security/mscapi java/util/stream java/util/Arrays/largeMemory java/util/BitSet/stream javax/rmi
+exclusiveAccess.dirs= \
+    com/sun/jndi/rmi \
+    java/rmi \
+    java/util/Arrays/largeMemory \
+    java/util/BitSet/stream \
+    java/util/prefs \
+    java/util/stream \
+    javax/rmi \
+    sun/management/jmxremote \
+    sun/rmi \
+    sun/security/mscapi \
+    sun/tools/jstatd
 # Group definitions
 groups=TEST.groups