--- old/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java	2016-07-18 00:52:27.016130271 -0700
+++ new/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java	2016-07-18 00:52:26.892130271 -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
@@ -35,6 +35,7 @@
 import javax.xml.validation.SchemaFactory;
 
 import org.testng.Assert;
+import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
@@ -47,6 +48,7 @@
  * @bug 6946312
  * @summary Test XML parser shall callback to ContentHandler when receiving characters data.
  */
+@Listeners({jaxp.library.FilePolicy.class})
 public class Bug6946312Test {
     static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
     static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource";
@@ -83,7 +85,8 @@
         }
     }
 
-    public class MyContentHandler implements ContentHandler {
+    @Listeners({jaxp.library.BasePolicy.class})
+public class MyContentHandler implements ContentHandler {
         public void characters(char[] ch, int start, int length) {
             charEvent = true;
             System.out.println("Characters called: " + new String(ch, start, length));