--- old/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java	2016-07-18 00:50:21.459225272 -0700
+++ new/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java	2016-07-18 00:50:21.340284772 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -28,14 +28,14 @@
 
 import javax.xml.namespace.QName;
 
-import jaxp.library.JAXPBaseTest;
-
+import org.testng.annotations.Listeners;
 import org.testng.annotations.Test;
 
 /*
  * @summary javax.xml.namespace.QName tests
  */
-public class NamespaceContextTest extends JAXPBaseTest {
+@Listeners({jaxp.library.BasePolicy.class})
+public class NamespaceContextTest {
     private static final String PREFIX = "astro";
     private static final String LOCAL_PART = "stardb";
     private static final String NS_URI = "http://www.astro.com";