--- old/test/jdk/java/lang/String/UnicodeCasingTest.java	2019-05-22 15:33:31.000000000 -0700
+++ new/test/jdk/java/lang/String/UnicodeCasingTest.java	2019-05-22 15:33:30.000000000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,9 @@
 
 /*
  * @test
- * @bug 4397357 6565620 6959267 7070436 7198195 8032446 8072600
+ * @bug 4397357 6565620 6959267 7070436 7198195 8032446 8072600 8221431
  * @summary Confirm normal case mappings are handled correctly.
+ * @library /lib/testlibrary/java/lang
  * @run main/timeout=200 UnicodeCasingTest
  */
 
@@ -70,8 +71,7 @@
             // First, we create exlude lists of characters whose mappings exist
             // in SpecialCasing.txt and mapping rules in UnicodeData.txt aren't
             // applicable.
-            in = Files.newBufferedReader(Paths.get(System.getProperty("test.src.path"), "..", "/Character/SpecialCasing.txt")
-                     .toRealPath());
+            in = Files.newBufferedReader(UCDFiles.SPECIAL_CASING.toRealPath());
             String line;
             while ((line = in.readLine()) != null) {
                 if (line.length() == 0 || line.charAt(0) == '#') {
@@ -88,8 +88,7 @@
                 defaultLang = locale.getLanguage();
 //                System.out.println("Testing on " + locale + " locale....");
                 System.err.println("Testing on " + locale + " locale....");
-                in = Files.newBufferedReader(Paths.get(System.getProperty("test.src.path"), "..", "/Character/UnicodeData.txt")
-                     .toRealPath());
+                in = Files.newBufferedReader(UCDFiles.UNICODE_DATA.toRealPath());
                 while ((line = in.readLine()) != null) {
                     if (line.length() == 0 || line.charAt(0) == '#') {
                         continue;