--- old/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java	2016-07-21 20:33:37.082027778 -0700
+++ new/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java	2016-07-21 20:33:36.956027778 -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,11 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Source;
+
 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 +53,7 @@
  * @bug 8081248, 8144966, 8146606, 8146237, 8151154, 8150969, 8151162, 8152527, 8154220
  * @summary Tests basic Catalog functions.
  */
+//@Listeners({jaxp.library.FilePolicy.class}) //uncomment this line after 8161176 is resolved
 public class CatalogTest {
     static final String KEY_FILES = "javax.xml.catalog.files";
 
@@ -517,7 +521,6 @@
         return saxParser;
     }
 
-
     /**
      * SAX handler
      */
@@ -536,7 +539,8 @@
         }
 
         @Override
-        public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+        public void startElement(String uri, String localName, String qName, Attributes attributes)
+                throws SAXException {
             textContent.delete(0, textContent.length());
             try {
                 System.out.println("Element: " + uri + ":" + localName + " " + qName);