--- old/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java	2016-07-18 00:50:28.692606772 -0700
+++ new/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java	2016-07-18 00:50:28.565670271 -0700
@@ -24,6 +24,7 @@
 
 import java.io.IOException;
 import java.nio.file.Paths;
+
 import javax.xml.catalog.Catalog;
 import javax.xml.catalog.CatalogException;
 import javax.xml.catalog.CatalogFeatures;
@@ -35,9 +36,13 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Source;
+
+import jaxp.library.JAXPTestUtilities;
+
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
+import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.ErrorHandler;
@@ -50,6 +55,7 @@
  * @bug 8081248, 8144966, 8146606, 8146237, 8151154, 8150969, 8151162, 8152527, 8154220
  * @summary Tests basic Catalog functions.
  */
+@Listeners({jaxp.library.FilePolicy.class})
 public class CatalogTest {
     static final String KEY_FILES = "javax.xml.catalog.files";
 
@@ -521,7 +527,8 @@
     /**
      * SAX handler
      */
-    public class MyHandler extends DefaultHandler2 implements ErrorHandler {
+    @Listeners({jaxp.library.BasePolicy.class})
+public class MyHandler extends DefaultHandler2 implements ErrorHandler {
 
         StringBuilder textContent = new StringBuilder();
         SAXParser saxParser;