--- old/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java	2016-07-21 20:33:35.632027778 -0700
+++ new/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java	2016-07-21 20:33:35.516027778 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -37,8 +37,7 @@
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamSource;
 
-import jaxp.library.JAXPFileBaseTest;
-
+import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -48,8 +47,8 @@
  * @bug 4858685 4894410
  * @summary test transforming text node
  */
-
-public class Bug4858685 extends JAXPFileBaseTest {
+@Listeners({jaxp.library.FilePolicy.class})
+public class Bug4858685 {
     @Test
     public void test() throws TransformerException, IOException {
         String uri = XML_DIR + "certificate.xml";