--- a/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java	Tue Aug 27 14:44:21 2019 -0700
+++ b/test/jaxp/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java	Wed Aug 28 11:00:55 2019 +0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, 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
@@ -36,6 +36,7 @@
 
 import org.testng.Assert;
 import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
 
 /*
  * @test
@@ -46,6 +47,7 @@
  */
 @Listeners({jaxp.library.FilePolicy.class})
 public class SecureProcessingTest {
+    @Test
     public void testSecureProcessing() {
         boolean _isSecureMode = System.getSecurityManager() != null;
         // SECURE_PROCESSING == false

--- a/test/jdk/javax/xml/jaxp/testng/validation/jdk8037819/BasicTest1.java	Tue Aug 27 14:44:21 2019 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-package validation.jdk8037819;
-
-import com.sun.org.apache.xerces.internal.dom.PSVIElementNSImpl;
-import com.sun.org.apache.xerces.internal.xs.ItemPSVI;
-import validation.BaseTest;
-
-public class BasicTest1 extends BaseTest {
-    public static void main(String[] args) throws Exception {
-        BasicTest1 test = new BasicTest1();
-        test.setUp();
-        test.testSimpleValidation();
-        test.testSimpleValidationWithTrivialXSIType();
-        test.tearDown();
-    }
-
-    protected String getXMLDocument() {
-        return "base.xml";
-    }
-
-    protected String getSchemaFile() {
-        return "base.xsd";
-    }
-
-    public BasicTest1() {
-        super("BasicTest1");
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-    }
-
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testSimpleValidation() {
-        try {
-            reset();
-            validateDocument();
-        } catch (Exception e) {
-            fail("Validation failed: " + e.getMessage());
-        }
-        doValidityAsserts();
-    }
-
-    public void testSimpleValidationWithTrivialXSIType() {
-        try {
-            reset();
-            ((PSVIElementNSImpl) fRootNode).setAttributeNS(
-                "http://www.w3.org/2001/XMLSchema-instance", "type", "X");
-            validateDocument();
-        } catch (Exception e) {
-            fail("Validation failed: " + e.getMessage());
-        }
-        doValidityAsserts();
-    }
-
-    private void doValidityAsserts() {
-        assertValidity(ItemPSVI.VALIDITY_VALID, fRootNode.getValidity());
-        assertValidationAttempted(ItemPSVI.VALIDATION_FULL, fRootNode
-                .getValidationAttempted());
-        assertElementName("A", fRootNode.getElementDeclaration().getName());
-        assertElementNamespaceNull(fRootNode.getElementDeclaration()
-                .getNamespace());
-        assertTypeName("X", fRootNode.getTypeDefinition().getName());
-        assertTypeNamespaceNull(fRootNode.getTypeDefinition().getNamespace());
-    }
-}