--- old/test/java/util/PluggableLocale/CollatorProviderTest.java	Fri Jul 20 11:45:56 2012
+++ new/test/java/util/PluggableLocale/CollatorProviderTest.java	Fri Jul 20 11:45:55 2012
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, 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
@@ -26,7 +26,7 @@
 
 import java.text.*;
 import java.util.*;
-import sun.util.*;
+import sun.util.locale.provider.*;
 import sun.util.resources.*;
 
 public class CollatorProviderTest extends ProviderTest {
@@ -34,7 +34,8 @@
     com.foo.CollatorProviderImpl cp = new com.foo.CollatorProviderImpl();
     List<Locale> availloc = Arrays.asList(Collator.getAvailableLocales());
     List<Locale> providerloc = Arrays.asList(cp.getAvailableLocales());
-    List<Locale> jreloc = Arrays.asList(LocaleData.getAvailableLocales());
+    List<Locale> jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales());
+    List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getCollatorProvider().getAvailableLocales());
 
     public static void main(String[] s) {
         new CollatorProviderTest();
@@ -47,7 +48,8 @@
 
     void availableLocalesTest() {
         Set<Locale> localesFromAPI = new HashSet<Locale>(availloc);
-        Set<Locale> localesExpected = new HashSet<Locale>(jreloc);
+        Set<Locale> localesExpected = new HashSet<Locale>(jreimplloc);
+        localesExpected.remove(Locale.ROOT);
         localesExpected.addAll(providerloc);
         if (localesFromAPI.equals(localesExpected)) {
             System.out.println("availableLocalesTest passed.");
@@ -62,8 +64,12 @@
 
         for (Locale target: availloc) {
             // pure JRE implementation
-            ResourceBundle rb = LocaleData.getCollationData(target);
-            boolean jreSupportsLocale = jreloc.contains(target);
+            Set<Locale> jreimplloc = new HashSet<>();
+            for (String tag : ((AvailableLanguageTags)LocaleProviderAdapter.forJRE().getCollatorProvider()).getAvailableLanguageTags()) {
+                jreimplloc.add(Locale.forLanguageTag(tag));
+            }
+            ResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getCollationData(target);
+            boolean jreSupportsLocale = jreimplloc.contains(target);
 
             // result object
             Collator result = Collator.getInstance(target);