--- old/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java	2016-07-18 00:50:55.464214272 -0700
+++ new/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java	2016-07-18 00:50:55.346273272 -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
@@ -38,6 +38,7 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
+import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -49,6 +50,7 @@
  * @bug 6564400
  * @summary Test ignorable whitespace handling with schema validation.
  */
+@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6564400 {
     private boolean sawIgnorable = false;
     Schema schema = null;
@@ -168,7 +170,8 @@
         return ok;
     }
 
-    public class MyHandler extends DefaultHandler {
+    @Listeners({jaxp.library.BasePolicy.class})
+public class MyHandler extends DefaultHandler {
         public void ignorableWhitespace(char[] ch, int start, int length) {
             sawIgnorable = true;
         }