--- old/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java	2016-07-18 00:50:57.227332271 -0700
+++ new/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java	2016-07-18 00:50:57.110390771 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -30,6 +30,7 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -38,6 +39,7 @@
  * @bug 6608841
  * @summary Test SAX parses external parameter entity.
  */
+@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6608841 {
     public Bug6608841(String name) {
     }
@@ -50,6 +52,7 @@
         parser.parse(new File(file), new MyHandler());
     }
 
-    public class MyHandler extends DefaultHandler {
+    @Listeners({jaxp.library.BasePolicy.class})
+public class MyHandler extends DefaultHandler {
     }
 }