--- old/test/jdk/java/util/regex/RegExTest.java	2019-05-22 15:33:33.000000000 -0700
+++ new/test/jdk/java/util/regex/RegExTest.java	2019-05-22 15:33:33.000000000 -0700
@@ -35,9 +35,10 @@
  * 8027645 8035076 8039124 8035975 8074678 6854417 8143854 8147531 7071819
  * 8151481 4867170 7080302 6728861 6995635 6736245 4916384 6328855 6192895
  * 6345469 6988218 6693451 7006761 8140212 8143282 8158482 8176029 8184706
- * 8194667 8197462 8184692
+ * 8194667 8197462 8184692 8221431
  *
  * @library /test/lib
+ * @library /lib/testlibrary/java/lang
  * @build jdk.test.lib.RandomFactory
  * @run main RegExTest
  * @key randomness
@@ -4755,8 +4756,7 @@
     }
 
     private static void grapheme() throws Exception {
-        Files.lines(Paths.get(System.getProperty("test.src", "."),
-                              "GraphemeBreakTest.txt"))
+        Files.lines(UCDFiles.GRAPHEME_BREAK_TEST)
             .filter( ln -> ln.length() != 0 && !ln.startsWith("#") )
             .forEach( ln -> {
                     ln = ln.replaceAll("\\s+|\\([a-zA-Z]+\\)|\\[[a-zA-Z]]+\\]|#.*", "");