--- old/test/java/util/Locale/LocaleProviders.java	Fri Apr 26 11:03:27 2013
+++ new/test/java/util/Locale/LocaleProviders.java	Fri Apr 26 11:03:25 2013
@@ -60,6 +60,10 @@
                 bug8010666Test();
                 break;
 
+            case "bug8013086Test":
+                bug8013086Test(args[1], args[2]);
+                break;
+
             default:
                 throw new RuntimeException("Test method '"+methodName+"' not found.");
         }
@@ -142,4 +146,13 @@
             }
         }
     }
+
+    static void bug8013086Test(String lang, String ctry) {
+        try {
+            // Throws a NullPointerException if the test fails.
+            System.out.println(new SimpleDateFormat("z", new Locale(lang, ctry)).parse("UTC"));
+        } catch (ParseException pe) {
+            // ParseException is fine in this test, as it's not "UTC"
+        }
+    }
 }