diff --git a/jsp/pom.xml b/jsp/pom.xml
index 684cf9b0cd..db66370d47 100644
--- a/jsp/pom.xml
+++ b/jsp/pom.xml
@@ -36,11 +36,11 @@
     <properties>
         <arquillian.junit>1.7.0.Alpha14</arquillian.junit>
         <jakarta.annotation-api.version>3.0.0-M1</jakarta.annotation-api.version>
-        <jakarta.el-api.version>6.0.0-M2</jakarta.el-api.version>
+        <jakarta.el-api.version>6.0.0-RC1</jakarta.el-api.version>
         <jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
-        <jakarta.servlet-api.version>6.1.0-M1</jakarta.servlet-api.version>
+        <jakarta.servlet-api.version>6.1.0-M2</jakarta.servlet-api.version>
         <jms-api.version>3.1.0</jms-api.version>
-        <jsp-api.version>4.0.0-M1</jsp-api.version>
+        <jsp-api.version>4.0.0-M2</jsp-api.version>
         <junit.jupiter.version>5.9.1</junit.jupiter.version>
     </properties>
 
@@ -76,9 +76,9 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>servlet</artifactId>
-            <version>${project.parent.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>tck-runtime</artifactId>
+            <version>6.1.0-M1</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginValidator.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginValidator.java
deleted file mode 100644
index 759e41bc1a..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginValidator.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2007, 2022 Oracle and/or its affiliates and others.
- * All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-package com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import com.sun.ts.lib.util.TestUtil;
-import com.sun.ts.tests.common.webclient.WebTestCase;
-import com.sun.ts.tests.common.webclient.validation.ValidationStrategy;
-
-/**
- * This validator will, loosely, validate that a jsp:plugin action does not
- * generate any output.
- */
-public class JspPluginValidator implements ValidationStrategy {
-  private static final String NL = System.getProperty("line.separartor", "\n");
-
-  /**
-   * A map to provided a relation ship between HTML spec'd attributes and the
-   * alternate attributes suggested by the Java Plugin documentation.
-   */
-  private static HashMap<String, String> attributeMap = new HashMap<String, String>();
-  static {
-    attributeMap.put("code", "java_code");
-    attributeMap.put("codebase", "java_codebase");
-    attributeMap.put("archive", "java_archive");
-    attributeMap.put("object", "java_object");
-    attributeMap.put("type", "java_type");
-  }
-
-  /**
-   * Creates a new JspPluginValidator instance.
-   */
-  public JspPluginValidator() {
-  }
-
-  /**
-   * Validates the response from the search using a string or series of strings
-   * obtained from the WebTestCase. The order and case of the Strings found in
-   * the response are not important.
-   * 
-   * @param testCase
-   * @return
-   */
-  public boolean validate(WebTestCase testCase) {
-
-    List<String> searchStrings = testCase.getSearchStrings();
-    List<String> unexpectedSearchStrings = testCase.getUnexpectedSearchStrings();
-    boolean passed = true;
-    String response = null;
-
-    // Any status code aside from a 200 will result in
-    // test failure.
-    String statusCode = testCase.getResponse().getStatusCode();
-    if (!statusCode.equals("200")) {
-      TestUtil.logErr("[CaseInsensitiveValidator] Expected a status code "
-          + "of 200.  Received: " + statusCode);
-      return false;
-    }
-
-    // get response body
-    try {
-      response = testCase.getResponse().getResponseBodyAsRawString().toLowerCase();
-
-      String[] htmlTokens = prepareTokens(
-          new StringTokenizer(response, "<>='\";\n\t "));
-
-      // If tracing is enabled, display the tokens returned by
-      // prepareTokens.
-      if (TestUtil.traceflag) {
-        StringBuffer sb = new StringBuffer(255);
-        for (int i = 0; i < htmlTokens.length; i++) {
-          sb.append(htmlTokens[i]).append(" ");
-          if (i > 0 && (i % 5) == 0) {
-            sb.append(NL);
-          }
-        }
-        TestUtil.logTrace("Parsed Tokens from response" + NL
-            + "------------------------------------------" + NL
-            + sb.toString());
-      }
-
-      // Check the response for object tag in the response
-      if (response.indexOf("<embed") > -1) {
-        TestUtil.logErr("[JspPluginValidator] Found EMBED tag in the server's response.");
-        return false;
-      }
-
-      // Check the response for embed tag in the response
-      if (response.indexOf("<object") > -1) {
-        TestUtil.logErr("[JspPluginValidator] Found OBJECT tag in the server's response.");
-        return false;
-      }
-
-      List<String> itemsNotFound = scanForExpectedValues(response, htmlTokens, searchStrings);
-
-      // check to see if we had any misses
-      if (itemsNotFound.size() > 0) {
-        passed = false;
-        TestUtil.logErr("[JspPluginValidator]  Unable to find the following"
-            + "search strings in the response");
-        for (int i = 0, size = itemsNotFound.size(); i < size; i++) {
-          TestUtil.logErr("\t" + itemsNotFound.get(i));
-        }
-        TestUtil.logErr("[JspPluginValidator] Server's response:" + NL
-            + "-------------------------------------------------" + NL
-            + response);
-      }
-
-      if (scanForUnexpectedValues(response, unexpectedSearchStrings)) {
-        passed = false;
-      }
-
-    } catch (IOException ioe) {
-      TestUtil.logErr("[CaseInsensitiveValidator] Unexpected IOException "
-          + "reading response body.", ioe);
-    } catch (NullPointerException npe) {
-      TestUtil.logErr(
-          "[CaseInsensitiveValidator] Unexpected HullPointerException when calling "
-              + "getResponseBodyAsRawString",
-          npe);
-    }
-
-    return passed;
-  }
-
-  /**
-   * Scan the response for anything that the test doesn't expect.
-   * 
-   * @param response
-   *          - the server's response
-   * @param unexpectedSearchStrings
-   *          - a List of strings to search for
-   * @return false if none of the strings are found or true on the first match
-   */
-  private static boolean scanForUnexpectedValues(String response,
-      List<String> unexpectedSearchStrings) {
-    boolean found = false;
-    if (unexpectedSearchStrings != null) {
-      for (int i = 0, size = unexpectedSearchStrings.size(); i < size; i++) {
-        String sString = (String) unexpectedSearchStrings.get(i);
-        TestUtil.logTrace("[JspPluginValidator] Searching from unexpected"
-            + " search string '" + sString + "' in the server's response...");
-        if (response.indexOf((String) unexpectedSearchStrings.get(i)) > -1) {
-          TestUtil.logTrace("[JspPluginValidator] '" + sString + "' found!  "
-              + "Test fails!");
-          found = true;
-          break;
-        }
-      }
-    }
-    return found;
-  }
-
-  /**
-   * Scan the plugin attributes or other data aside from OBJECT or EMBED tags.
-   * The search works as follows: - If the search string doesn't contain an
-   * equal ('=') sign, then do an indexOf against the response body using the
-   * search string as the argument. - If the search string contains an equal
-   * ('=') sign, then tokenize the search string to get the name and the value.
-   * Check to see if the name token and the next token being checked are the
-   * same. If they are, set found to true. If they aren't the same, check to see
-   * if this name has an alternate name. If it does, use the altername name and
-   * check to see if it's equal to the current token. If they are, set found to
-   * true. - If found is false, then add the search string that couldn't be
-   * found to a list of search misses to be displayed after the loop completes.
-   * 
-   * @param response
-   *          - the server's response
-   * @param htmlTokens
-   *          - a tokenized version of the server's response
-   * @param searchStrings
-   *          - the strings to search for.
-   * @return a list containing the search strings that were not found. If all
-   *         search strings were found, then an empty list will be returned.
-   */
-  private static List<String> scanForExpectedValues(String response,
-      String[] htmlTokens, List<String> searchStrings) {
-    List<String> itemsNotFound = new ArrayList<String>();
-
-    for (int i = 0, size = searchStrings.size(); i < size; i++) {
-      boolean found = false;
-      String currentSearchString = (String) searchStrings.get(i);
-      TestUtil.logTrace("[JspPluginValidator] Searching for '"
-          + currentSearchString + "'....");
-      if (currentSearchString.indexOf("=") > -1) {
-        String[] tokStrings = tokenizeNameValuePair(currentSearchString);
-        for (int j = 0; j < htmlTokens.length; j++) {
-          if (tokStrings[0].equals(htmlTokens[j])) {
-            if (tokStrings[1].equals(htmlTokens[++j])) {
-              found = true;
-              j--;
-            }
-          } else if (hasAlternateAttributeName(tokStrings[0])) {
-            if (getAlternateAttributeName(tokStrings[0])
-                .equals(htmlTokens[j])) {
-              if (tokStrings[1].equals(htmlTokens[++j])) {
-                found = true;
-                j--;
-              }
-            }
-          }
-        }
-        if (!found) {
-          itemsNotFound.add(currentSearchString);
-        } else {
-          TestUtil.logTrace("[JspPluginValidator] Search string '"
-              + currentSearchString + "' found!");
-        }
-      } else {
-        if (response.indexOf(currentSearchString) < 0) {
-          itemsNotFound.add(currentSearchString);
-        } else {
-          TestUtil.logTrace("[JspPluginValidator] Search string '"
-              + currentSearchString + "' found!");
-        }
-      }
-    }
-    return itemsNotFound;
-  }
-
-  /**
-   * Builds an array based of the StringTokenizer provided. If the method finds
-   * a sequence of tokens like: param name paramName value paramValue - or -
-   * param value paramValue name paramName It will not add the tokens 'param',
-   * 'name', or 'value', but will add the paramName and paraValue to the final
-   * token list (in that order).
-   * 
-   * @param st
-   *          - the StringTokenizer to build the array from
-   * @return an array of String values based off the server's response
-   */
-  private static String[] prepareTokens(StringTokenizer st) {
-    List<String> finalTokens = new ArrayList<String>();
-
-    while (st.hasMoreTokens()) {
-      String token = st.nextToken();
-      if (token.equals("param")) {
-        String name = null;
-        String value = null;
-        token = st.nextToken();
-        if (token.equals("name")) {
-          name = st.nextToken();
-        }
-        if (token.equals("value")) {
-          value = st.nextToken();
-        }
-        finalTokens.add(name);
-        finalTokens.add(value);
-      } else {
-        finalTokens.add(token);
-      }
-    }
-    return (String[]) finalTokens.toArray(new String[finalTokens.size()]);
-  }
-
-  /**
-   * Used for tokenizing the search strings configured by the test case.
-   * 
-   * @param nameValuePair
-   *          a search string in the format of 'name=value'
-   * @return a String array representation of the name value pair
-   */
-  private static String[] tokenizeNameValuePair(String nameValuePair) {
-    StringTokenizer st = new StringTokenizer(nameValuePair.trim().toLowerCase(),
-        "=");
-    List<String> list = new ArrayList<String>();
-    while (st.hasMoreTokens()) {
-      list.add(st.nextToken());
-    }
-    return (String[]) list.toArray(new String[list.size()]);
-  }
-
-  /**
-   * Returns the alternate attribute name for the provided name.
-   * 
-   * @param name
-   *          - the attribute name whose alternate name will be returned
-   * @return this name's alternate attribute name
-   */
-  private static String getAlternateAttributeName(String name) {
-    return (String) attributeMap.get(name);
-  }
-
-  /**
-   * Determines if the provide name has an alternate name.
-   * 
-   * @param name
-   *          - the attribute name
-   * @return - true if the attribute name provided has an alternative.
-   */
-  private static boolean hasAlternateAttributeName(String name) {
-    return attributeMap.containsKey(name);
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClientIT.java
deleted file mode 100644
index fee0ba37fc..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/URLClientIT.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Copyright (c) 2007, 2022 Oracle and/or its affiliates and others.
- * All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * $Id$
- */
-
-/*
- * @(#)URLClient.java	1.1 12/09/02
- */
-
-package com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin;
-
-
-import java.io.IOException;
-import com.sun.ts.tests.jsp.common.client.AbstractUrlClient;
-import com.sun.ts.tests.jsp.common.util.JspTestUtil;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.junit5.ArquillianExtension;
-import org.jboss.shrinkwrap.api.Filters;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.jboss.shrinkwrap.api.asset.UrlAsset;
-
-
-@ExtendWith(ArquillianExtension.class)
-public class URLClientIT extends AbstractUrlClient {
-
-
-  public URLClientIT() throws Exception {
-
-
-    setContextRoot("/jsp_core_act_plugin_web");
-
-  }
-
-  @Deployment(testable = false)
-  public static WebArchive createDeployment() throws IOException {
-    
-    String packagePath = URLClientIT.class.getPackageName().replace(".", "/");
-    WebArchive archive = ShrinkWrap.create(WebArchive.class, "jsp_core_act_plugin_web.war");
-    archive.addClasses(JspPluginValidator.class, JspTestUtil.class);
-    archive.setWebXML(URLClientIT.class.getClassLoader().getResource(packagePath+"/jsp_core_act_plugin_web.xml"));
-    
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginWidthRtAttributeValueTest.jsp")), "JspPluginWidthRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginWidthElAttributeValueTest.jsp")), "JspPluginWidthElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginVspaceRtAttributeValueTest.jsp")), "JspPluginVspaceRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginVspaceElAttributeValueTest.jsp")), "JspPluginVspaceElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginTypeRtAttributeValueTest.jsp")), "JspPluginTypeRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginTypeElAttributeValueTest.jsp")), "JspPluginTypeElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNsPluginUrlRtAttributeValueTest.jsp")), "JspPluginNsPluginUrlRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNsPluginUrlElAttributeValueTest.jsp")), "JspPluginNsPluginUrlElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNameRtAttributeValueTest.jsp")), "JspPluginNameRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginNameElAttributeValueTest.jsp")), "JspPluginNameElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJspParamsNoParametersTest.jsp")), "JspPluginJspParamsNoParametersTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJspAttributeTest.jsp")), "JspPluginJspAttributeTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJreversionRtAttributeValueTest.jsp")), "JspPluginJreversionRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginJreversionElAttributeValueTest.jsp")), "JspPluginJreversionElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginInvalidTypeTest.jsp")), "JspPluginInvalidTypeTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginIePluginUrlRtAttributeValueTest.jsp")), "JspPluginIePluginUrlRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginIePluginUrlElAttributeValueTest.jsp")), "JspPluginIePluginUrlElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHspaceRtAttributeValueTest.jsp")), "JspPluginHspaceRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHspaceElAttributeValueTest.jsp")), "JspPluginHspaceElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHeightRtAttributeValueTest.jsp")), "JspPluginHeightRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginHeightElAttributeValueTest.jsp")), "JspPluginHeightElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeRtAttributeValueTest.jsp")), "JspPluginCodeRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeReqAttributeTest.jsp")), "JspPluginCodeReqAttributeTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeElAttributeValueTest.jsp")), "JspPluginCodeElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeBaseRtAttributeValueTest.jsp")), "JspPluginCodeBaseRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeBaseReqAttributeTest.jsp")), "JspPluginCodeBaseReqAttributeTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginCodeBaseElAttributeValueTest.jsp")), "JspPluginCodeBaseElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginBeanTest.jsp")), "JspPluginBeanTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginArchiveRtAttributeValueTest.jsp")), "JspPluginArchiveRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginArchiveElAttributeValueTest.jsp")), "JspPluginArchiveElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginAppletTest.jsp")), "JspPluginAppletTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginAlignRtAttributeValueTest.jsp")), "JspPluginAlignRtAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspPluginAlignElAttributeValueTest.jsp")), "JspPluginAlignElAttributeValueTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamsUsageContextTest.jsp")), "JspParamsUsageContextTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspParamsBodyTest.jsp")), "JspParamsBodyTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspFallbackUsageContextTest.jsp")), "JspFallbackUsageContextTest.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/JspFallbackBodyTest.jsp")), "JspFallbackBodyTest.jsp");
-    return archive;
-
-  }
-
-  /*
-   * @class.setup_props: webServerHost; webServerPort; ts_home;
-   *
-   */
-
-  /* Run test */
-
-  /*
-   * @testName: jspPluginTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.4;JSP:SPEC:167.5;JSP:SPEC:167.6;
-   * JSP:SPEC:167.8;JSP:SPEC:167.9;JSP:SPEC:167.10;
-   * JSP:SPEC:167.11;JSP:SPEC:167.12;JSP:SPEC:167.13;
-   * JSP:SPEC:167.15;JSP:SPEC:167.16;JSP:SPEC:167.17; JSP:SPEC:167.18
-   * 
-   * @test_Strategy: Validate, rather loosely as the output will be
-   * implementation dependent, the output of a jsp:plugin action.
-   */
-  @Test
-  public void jspPluginTest() throws Exception {
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginAppletTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(SEARCH_STRING, "expected_text");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH,
-        "http://www.nowaythiswebsitecouldpossiblyexist.com|" +
-        "fallback_text|vspace=1|hspace=1|" +
-        "width=10|height=10|test=testvalue|applet|" +
-        "code=foo.class|archive=test.jar|name=test|" +
-        "align=middle|codebase=/");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginBeanTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(SEARCH_STRING, "expected_text");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH,
-        "http://www.nowaythiswebsitecouldpossiblyexist.com|" +
-        "fallback_text|vspace=1|hspace=1|" +
-        "width=10|height=10|test=testvalue|bean|" +
-        "code=foo.class|archive=test.jar|name=test|" +
-        "align=middle|codebase=/");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-
-  /*
-   * @testName: jspPluginDynamicAttributesTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.15.1;JSP:SPEC:167.9.1
-   * 
-   * @test_Strategy: Validate that the only the height and width attributes of
-   * jsp:plugin accept RT and EL Expressions.
-   */
-  @Test
-  public void jspPluginDynamicAttributesTest() throws Exception {
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginHeightElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "height=10");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginHeightRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "height=10");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginWidthElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "width=10");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginWidthRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "width=10");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginAlignElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginAlignRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginArchiveElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginArchiveRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginCodeBaseElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginCodeBaseRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginCodeElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginCodeRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginHspaceElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginHspaceRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginIePluginUrlElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginIePluginUrlRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginJreversionElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginJreversionRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginNameElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginNameRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginNsPluginUrlElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginNsPluginUrlRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginTypeElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginTypeRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginVspaceElAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginVspaceRtAttributeValueTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-
-  /*
-   * @testName: jspParamsUsageContextTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.2.2
-   * 
-   * @test_Strategy: Validate that if the jsp:params action is not nested within
-   * a jsp:plugin action, a translation-time error will occur.
-   */
-  @Test
-  public void jspParamsUsageContextTest() throws Exception {
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspParamsUsageContextTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-
-  /*
-   * @testName: jspFallbackUsageContextTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.3.2
-   * 
-   * @test_Strategy: Validate that if the jsp:fallback action is used in a
-   * context other than a nested child of the jsp:plugin action, a
-   * translation-time error is generated.
-   */
-  @Test
-  public void jspFallbackUsageContextTest() throws Exception {
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspFallbackUsageContextTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-
-  /*
-   * @testName: jspFallbackBodyTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.3.2
-   * 
-   * @test_Strategy: Validate the body of the jsp:fallback action can be
-   * supplied using the jsp:body action.
-   */
-  @Test
-  public void jspFallbackBodyTest() throws Exception {
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspFallbackBodyTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(SEARCH_STRING, "expected_text");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "<jsp:body>|fallback_text|</jsp:body>");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-
-  /*
-   * @testName: jspParamsBodyTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.21
-   * 
-   * @test_Strategy: Validate the body of the jsp:params action can be supplied
-   * using the jsp:body action.
-   */
-  @Test
-  public void jspParamsBodyTest() throws Exception {
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspParamsBodyTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(SEARCH_STRING, "expected_text");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH, "<jsp:body>|param1=value1|</jsp:body>");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-
-  /*
-   * @testName: jspPluginInvalidTypeTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.4.1
-   * 
-   * @test_Strategy: Validate that if the type attribute is provided a value
-   * other than 'bean', or 'applet' that a translation error occurs.
-   */
-  @Test
-  public void jspPluginInvalidTypeTest() throws Exception {
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginInvalidTypeTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-
-  /*
-   * @testName: jspPluginJspAttributeTest
-   * 
-   * @assertion_ids: JSP:SPEC:167.20
-   * 
-   * @test_Strategy: Validate the attributes of the jsp:plugin action can be
-   * described by the jsp:attribute action.
-   */
-  @Test
-  public void jspPluginJspAttributeTest() throws Exception {
-    TEST_PROPS.setProperty(STRATEGY,
-        "com.sun.ts.tests.jsp.spec.core_syntax.actions.plugin.JspPluginValidator");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_core_act_plugin_web/JspPluginJspAttributeTest.jsp HTTP/1.1");
-    TEST_PROPS.setProperty(SEARCH_STRING, "expected_text");
-    TEST_PROPS.setProperty(UNEXPECTED_RESPONSE_MATCH,
-        "<jsp:attribute>|</jsp:attribute>|" +
-        "http://www.nowaythiswebsitecouldpossiblyexist.com|" +
-        "fallback_text|vspace=1|hspace=1|" +
-        "width=10|height=10|test=testvalue|bean|" +
-        "code=foo.class|archive=test.jar|name=test|" +
-        "align=middle|codebase=/");
-    TEST_PROPS.setProperty(REQUEST_HEADERS,
-        "User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 (ax)");
-    invoke();
-  }
-}
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/build.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/build.xml
deleted file mode 100644
index 890e54cd32..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project name="jsp_core_actions_plugin" basedir="." default="usage">
-<import file="../../../../../../../../../../bin/xml/ts.import.xml"/>
-    <property name="app.name" value="jsp_core_act_plugin"/>
-    <property name="pkg.name" value="core_syntax/actions/plugin"/>
-    <property name="contentroot.dir" value="${ts.home}/src/web/jsp/spec/${pkg.name}"/>
-
-    <target name="package">
-            <ts.war archivename="${app.name}" descriptor="${app.name}_web.xml">
-              <zipfileset dir="${contentroot.dir}" includes="**/*" excludes="**/*.gf"/>
-              <zipfileset dir="${class.dir}" 
-                          includes="com/sun/ts/tests/jsp/common/util/JspTestUtil.class"
-                          prefix="WEB-INF/classes"/>
-            </ts.war>
-            <ts.ear archivename="${app.name}"/>
-    </target>
-
-    <target name="compile">
-          <ts.javac includes="${pkg.dir}/**/*.java,
-                              com/sun/ts/tests/jsp/common/util/JspTestUtil.java,
-                              com/sun/ts/tests/common/webclient/**/*.java"/>
-    </target>
-
-</project>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml
deleted file mode 100644
index 171b8d6486..0000000000
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="5.0" xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd">
-  <display-name>JspCorSynActPlugin</display-name>
-  <session-config>
-    <session-timeout>5</session-timeout>
-  </session-config>
-</web-app>
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClientIT.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClientIT.java
index ea7ccafe82..6311cdd9f1 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClientIT.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/URLClientIT.java
@@ -75,7 +75,6 @@ public static WebArchive createDeployment() throws IOException {
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveErrorPage.jsp")), "positiveErrorPage.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateSession.jsp")), "positiveDuplicateSession.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateLanguage.jsp")), "positiveDuplicateLanguage.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateIsThreadSafe.jsp")), "positiveDuplicateIsThreadSafe.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateIsErrorPage.jsp")), "positiveDuplicateIsErrorPage.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateIsELIgnored.jsp")), "positiveDuplicateIsELIgnored.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/positiveDuplicateInfo.jsp")), "positiveDuplicateInfo.jsp");
@@ -97,8 +96,6 @@ public static WebArchive createDeployment() throws IOException {
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateSessionFatalTranslationError.jsp")), "negativeDuplicateSessionFatalTranslationError.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateLanguageFatalTranslationError2.jsp")), "negativeDuplicateLanguageFatalTranslationError2.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateLanguageFatalTranslationError.jsp")), "negativeDuplicateLanguageFatalTranslationError.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp")), "negativeDuplicateIsThreadSafeFatalTranslationError2.jsp");
-    archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsThreadSafeFatalTranslationError.jsp")), "negativeDuplicateIsThreadSafeFatalTranslationError.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsErrorPageFatalTranslationError2.jsp")), "negativeDuplicateIsErrorPageFatalTranslationError2.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsErrorPageFatalTranslationError.jsp")), "negativeDuplicateIsErrorPageFatalTranslationError.jsp");
     archive.add(new UrlAsset(URLClientIT.class.getClassLoader().getResource(packagePath+"/negativeDuplicateIsELIgnoredFatalTranslationError2.jsp")), "negativeDuplicateIsELIgnoredFatalTranslationError2.jsp");
@@ -288,45 +285,6 @@ public void negativeDuplicateAutoFlushFatalTranslationError2Test()
     invoke();
   }
 
-  /*
-   * @testName: negativeDuplicateIsThreadSafeFatalTranslationErrorTest
-   * 
-   * @assertion_ids: JSP:SPEC:21
-   * 
-   * @test_Strategy: Declare a page directive with two isThreadSafe attributes
-   * of different values. Validate that a fatal translation error occurs.
-   */
-
-  @Test
-  public void negativeDuplicateIsThreadSafeFatalTranslationErrorTest()
-      throws Exception {
-    String testName = "negativeDuplicateIsThreadSafeFatalTranslationError";
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_coresyntx_directive_page_web/" + testName + ".jsp HTTP/1.0");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    invoke();
-  }
-
-  /*
-   * @testName: negativeDuplicateIsThreadSafeFatalTranslationError2Test
-   * 
-   * @assertion_ids: JSP:SPEC:21
-   * 
-   * @test_Strategy: Declare two page directives with isThreadSafe attributes of
-   * different values. Validate that a fatal translation error occurs.
-   */
-
-  @Test
-  public void negativeDuplicateIsThreadSafeFatalTranslationError2Test()
-      throws Exception {
-    String testName = "negativeDuplicateIsThreadSafeFatalTranslationError2";
-    TEST_PROPS.setProperty(TEST_NAME, testName + "Test");
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_coresyntx_directive_page_web/" + testName + ".jsp HTTP/1.0");
-    TEST_PROPS.setProperty(STATUS_CODE, INTERNAL_SERVER_ERROR);
-    invoke();
-  }
-
   /*
    * @testName: negativeDuplicateIsErrorPageFatalTranslationErrorTest
    * 
@@ -1029,24 +987,6 @@ public void positiveDuplicateAutoFlushTest() throws Exception {
     invoke();
   }
 
-  /*
-   * @testName: positiveDuplicateIsThreadSafeTest
-   * 
-   * @assertion_ids: JSP:SPEC:21
-   * 
-   * @test_Strategy: Declare a page directive with two identical isThreadSafe
-   * attributes.
-   */
-
-  @Test
-  public void positiveDuplicateIsThreadSafeTest() throws Exception {
-    String testName = "positiveDuplicateIsThreadSafe";
-    TEST_PROPS.setProperty(REQUEST,
-        "GET /jsp_coresyntx_directive_page_web/" + testName + ".jsp HTTP/1.0");
-    TEST_PROPS.setProperty(SEARCH_STRING, "Test PASSED");
-    invoke();
-  }
-
   /*
    * @testName: positiveDuplicateIsErrorPageTest
    * 
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java
index 2fa1e3dd1d..0a8f9d19f2 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/httplistener/TestServlet.java
@@ -23,7 +23,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import com.sun.ts.tests.servlet.common.servlets.HttpTCKServlet;
+import servlet.tck.common.servlets.HttpTCKServlet;
 import com.sun.ts.tests.servlet.common.util.ServletTestUtil;
 
 import jakarta.servlet.ServletConfig;
diff --git a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java
index 830022def2..4387d29c81 100644
--- a/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java
+++ b/jsp/src/main/java/com/sun/ts/tests/jsp/spec/tagext/resource/listener/TestServlet.java
@@ -23,7 +23,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import com.sun.ts.tests.servlet.common.servlets.GenericTCKServlet;
+import servlet.tck.common.servlets.GenericTCKServlet;
 import com.sun.ts.tests.servlet.common.util.ServletTestUtil;
 
 import jakarta.servlet.ServletConfig;
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackBodyTest.jsp
deleted file mode 100644
index 41d44a2abe..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackBodyTest.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
-    All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<jsp:plugin type="bean" code="foo.class" codebase="." >
-    <jsp:fallback>
-        <jsp:body>fallback_text</jsp:body>
-    </jsp:fallback>
-</jsp:plugin>
-expected_text
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackUsageContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackUsageContextTest.jsp
deleted file mode 100644
index e4848f3fca..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspFallbackUsageContextTest.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<jsp:fallback>This should be a translation error.</jsp:fallback>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsBodyTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsBodyTest.jsp
deleted file mode 100644
index 557b41f6ea..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsBodyTest.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
-    All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%--
-     Validate the body of jsp:params can be provided through the use
-     of jsp:body
---%>
-<jsp:plugin type="bean" code="foo.class" codebase="/" >
-    <jsp:params>
-        <jsp:body>
-            <jsp:param name="param1" value="value1" />
-        </jsp:body>
-    </jsp:params>
-</jsp:plugin>
-expected_text
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsUsageContextTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsUsageContextTest.jsp
deleted file mode 100644
index 5de8942f92..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspParamsUsageContextTest.jsp
+++ /dev/null
@@ -1,26 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- A translation-time error will occur if the jsp:params is used in
-     any other context outside of being nested within a jsp:plugin element --%>
-
-<jsp:params>
-    <jsp:param name="param1" value="value1" />
-</jsp:params>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignElAttributeValueTest.jsp
deleted file mode 100644
index 55d58dc600..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The align attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" align="${'middle'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignRtAttributeValueTest.jsp
deleted file mode 100644
index 078aea76b7..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAlignRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The align attribute cannot accept Rt expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" align='<%= "middle" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAppletTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAppletTest.jsp
deleted file mode 100644
index 38fa91e0ca..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginAppletTest.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
-    All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-<jsp:plugin type="applet" code="foo.class" codebase="/"
-            align="middle" archive="test.jar" height="10"
-            hspace="1" jreversion="1.3.1" name="test"
-            vspace="1" width="10"
-            nspluginurl="http://www.nowaythiswebsitecouldpossiblyexist.com"
-            iepluginurl="http://www.nowaythiswebsitecouldpossiblyexist.com">
-            <jsp:params>
-                <jsp:param name="test" value="testvalue"/>
-            </jsp:params>
-            <jsp:fallback>fallback_text</jsp:fallback>
-</jsp:plugin>
-expected_text
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveElAttributeValueTest.jsp
deleted file mode 100644
index cd15f528d8..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The archive attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" archive="${'test.jar'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveRtAttributeValueTest.jsp
deleted file mode 100644
index 7e3a3b173c..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginArchiveRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The archive attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" archive='<%= "test.jar" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginBeanTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginBeanTest.jsp
deleted file mode 100644
index 12521429a1..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginBeanTest.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
-    All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-<jsp:plugin type="bean" code="foo.class" codebase="/"
-            align="middle" archive="test.jar" height="10"
-            hspace="1" jreversion="1.3.1" name="test"
-            vspace="1" width="10"
-            nspluginurl="http://www.nowaythiswebsitecouldpossiblyexist.com"
-            iepluginurl="http://www.nowaythiswebsitecouldpossiblyexist.com">
-            <jsp:params>
-                <jsp:param name="test" value="testvalue"/>
-            </jsp:params>
-            <jsp:fallback>fallback_text</jsp:fallback>
-</jsp:plugin>
-expected_text
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseElAttributeValueTest.jsp
deleted file mode 100644
index c51c613315..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The codebase attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="${'/'}" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseReqAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseReqAttributeTest.jsp
deleted file mode 100644
index 7fb2b25de1..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseReqAttributeTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- Validate a translation-time error occurs if the 'codebase' attribute is omitted --%>
-
-<jsp:plugin type="bean" code="foo.class" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseRtAttributeValueTest.jsp
deleted file mode 100644
index 585e6d279f..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeBaseRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The codebase attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase='<%= "/" %>' ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeElAttributeValueTest.jsp
deleted file mode 100644
index d30308b6f6..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeElAttributeValueTest.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The code attribute cannot accept EL expression values -> translation error --%>
-<jsp:plugin type="bean" code="${'foo.class'}" codebase="/" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeReqAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeReqAttributeTest.jsp
deleted file mode 100644
index 736a032ecc..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeReqAttributeTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- Validate a translation-time error occurs if the 'code' attribute is omitted --%>
-
-<jsp:plugin type="bean" codebase="/" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeRtAttributeValueTest.jsp
deleted file mode 100644
index 452f000379..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginCodeRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The code attribute cannot accept RT expression values -> translation error --%>
-<jsp:plugin type="bean" code='<%= "foo.class" %>' codebase="/" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightElAttributeValueTest.jsp
deleted file mode 100644
index 3d01d90539..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- Validate the height attribute can accept EL expressions --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" height="${'10'}"/>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightRtAttributeValueTest.jsp
deleted file mode 100644
index 6ebd027034..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHeightRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- Validate the height attribute can accept RT expressions --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" height='<%= "10" %>'/>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceElAttributeValueTest.jsp
deleted file mode 100644
index 9ba7edac2a..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The hspace attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" hspace="${'1'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceRtAttributeValueTest.jsp
deleted file mode 100644
index af0db4a3a3..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginHspaceRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The hspace attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" hspace='<%= "1" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlElAttributeValueTest.jsp
deleted file mode 100644
index 2eff09899e..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The iepluginurl attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" iepluginurl="${'http://www.nonexistent.com'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlRtAttributeValueTest.jsp
deleted file mode 100644
index eb8f5b7f5f..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginIePluginUrlRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The iepluginurl attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" iepluginurl='<%= "http://www.nonexistent.com" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginInvalidTypeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginInvalidTypeTest.jsp
deleted file mode 100644
index 44c0db1cdc..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginInvalidTypeTest.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- Validate a translation-time error occurs if a value other than applet
-     or bean is provided to the type attribute. --%>
-
-<jsp:plugin type="widget" code="foo.class" codebase="/" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionElAttributeValueTest.jsp
deleted file mode 100644
index e6e590c567..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The jreversion attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" jreversion="${'1.3.1'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionRtAttributeValueTest.jsp
deleted file mode 100644
index 929e97f4eb..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJreversionRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The jreversion attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" jreversion='<%= "1.3.1" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspAttributeTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspAttributeTest.jsp
deleted file mode 100644
index 83e1d3fbc8..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspAttributeTest.jsp
+++ /dev/null
@@ -1,46 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2022 Oracle and/or its affiliates and others.
-    All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-<jsp:plugin>
-    <jsp:attribute name="type">bean</jsp:attribute>
-    <jsp:attribute name="code">foo.class</jsp:attribute>
-    <jsp:attribute name="codebase">/</jsp:attribute>
-    <jsp:attribute name="align">middle</jsp:attribute>
-    <jsp:attribute name="archive">test.jar</jsp:attribute>
-    <jsp:attribute name="height">10</jsp:attribute>
-    <jsp:attribute name="vspace">1</jsp:attribute>
-    <jsp:attribute name="width">10</jsp:attribute>
-    <jsp:attribute name="hspace">1</jsp:attribute>
-    <jsp:attribute name="jreversion">1.3.1</jsp:attribute>
-    <jsp:attribute name="name">test</jsp:attribute>
-    <jsp:attribute name="nspluginurl">
-        http://www.nowaythiswebsitecouldpossiblyexist.com
-    </jsp:attribute>
-    <jsp:attribute name="iepluginurl">
-        http://www.nowaythis websitecouldpossibleexist.com
-    </jsp:attribute>
-    <jsp:body>
-        <jsp:params>
-            <jsp:param name="test" value="testvalue"/>
-        </jsp:params>
-        <jsp:fallback>fallback_text</jsp:fallback>
-    </jsp:body>
-</jsp:plugin>
-expected_text
\ No newline at end of file
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspParamsNoParametersTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspParamsNoParametersTest.jsp
deleted file mode 100644
index 8df3055901..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginJspParamsNoParametersTest.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- If the jsp:params element is nested within the jsp:plugin element,
-     there must be at least one jsp:param element or a translation-time
-     error will occur. --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" >
-    <jsp:params>
-    </jsp:params>
-</jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameElAttributeValueTest.jsp
deleted file mode 100644
index b9c2ce45be..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The name attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" name="${'test'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameRtAttributeValueTest.jsp
deleted file mode 100644
index c8f56b8328..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNameRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The name attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" name='<%= "name" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlElAttributeValueTest.jsp
deleted file mode 100644
index 2a6e723be3..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The nspluginurl attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" nspluginurl="${'http://www.nonexistent.com'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlRtAttributeValueTest.jsp
deleted file mode 100644
index 661304bb66..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginNsPluginUrlRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The nspluginurl attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" nspluginurl='<%= "http://www.nonexistent.com" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeElAttributeValueTest.jsp
deleted file mode 100644
index 4e8595eac2..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The type attribute cannot accept EL expression values --%>
-
-<jsp:plugin type="${'bean]}" code="foo.class" codebase="/" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeRtAttributeValueTest.jsp
deleted file mode 100644
index 4b07b52ae3..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginTypeRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,22 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The type attribute cannot accept RT expression values --%>
-<jsp:plugin type='<%= "bean" %>' code="foo.class" codebase="/" ></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceElAttributeValueTest.jsp
deleted file mode 100644
index 22857516c8..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The vspace attribute cannot accept EL expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" vspace="${'1'}"></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceRtAttributeValueTest.jsp
deleted file mode 100644
index 5b229ef7a1..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginVspaceRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- The vspace attribute cannot accept RT expressions -> translation-time error --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" vspace='<%= "1" %>'></jsp:plugin>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthElAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthElAttributeValueTest.jsp
deleted file mode 100644
index 233655c0d7..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthElAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- Validate the width attribute can accept EL expressions --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" width="${'10'}"/>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthRtAttributeValueTest.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthRtAttributeValueTest.jsp
deleted file mode 100644
index 31ec23c9ee..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginWidthRtAttributeValueTest.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<%--
-
-    Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<%@ page contentType="text/plain" %>
-
-<%-- Validate the width attribute can accept RT expressions --%>
-
-<jsp:plugin type="bean" code="foo.class" codebase="/" width='<%= "10" %>'/>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml
deleted file mode 100644
index 171b8d6486..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/jsp_core_act_plugin_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="5.0" xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd">
-  <display-name>JspCorSynActPlugin</display-name>
-  <session-config>
-    <session-timeout>5</session-timeout>
-  </session-config>
-</web-app>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError.jsp
deleted file mode 100644
index 602f731227..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%--
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<html>
-<title>negativeDuplicateIsThreadSafeFatalTranslationError</title>
-<body>
-<% /**	Name: negativeDuplicateIsThreadSafeFatalTranslationError 
-		Description: Verify that multiple uses of isThreadSafe attribute
-                     with different values result in a fatal translation error.
-		Result: A fatal translation error
-**/ %>		
-<%@ page isThreadSafe="true" isThreadSafe="false" %>
-</body>
-</html>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp
deleted file mode 100644
index eb06130005..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/negativeDuplicateIsThreadSafeFatalTranslationError2.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-<%--
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<html>
-<title>negativeDuplicateIsThreadSafeFatalTranslationError</title>
-<body>
-<% /**	Name: negativeDuplicateIsThreadSafeFatalTranslationError 
-		Description: Verify that multiple uses of isThreadSafe attribute
-                     with different values result in a fatal translation error.
-		Result: A fatal translation error
-**/ %>		
-<%@ page isThreadSafe="true" %>
-<%@ page isThreadSafe="false" %>
-</body>
-</html>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsThreadSafe.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsThreadSafe.jsp
deleted file mode 100644
index f63faae84b..0000000000
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/core_syntax/directives/page/positiveDuplicateIsThreadSafe.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%--
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
---%>
-
-<html>
-<title>positiveDuplicateIsThreadSafe</title>
-<body>
-<% /** 	Name : positiveDuplicateIsThreadSafe
-	Description : Verify that multiple uses of the isThreadSafe attribute with
-                      identical values accepted.
-	Result : Test Passed.
-**/ %>	 
-<%@ page isThreadSafe="false" %>
-<%@ page isThreadSafe="false" %>
-Test PASSED.
-</body>
-</html>
diff --git a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp
index 00a387d73e..8166119218 100644
--- a/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp
+++ b/jsp/src/main/resources/com/sun/ts/tests/jsp/spec/el/jsp/ImplicitELImport.jsp
@@ -1,6 +1,6 @@
 <%--
 
-    Copyright (c) 2021 Contributors to the Eclipse Foundation.
+    Copyright (c) 2024 Contributors to the Eclipse Foundation.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -17,10 +17,10 @@
 --%>
 
 <%-- jakarta.servlet.* --%>
-${AsyncContext.ASYNC_CONTEXT_PATH}
+${DispatcherType.ASYNC}
 
 <%-- jakarta.servlet.jsp.* --%>
-${PageContext.PAGE}
+<%-- No public, concrete classes with public constants --%>
 
 <%-- jakarta.servlet.http.* --%>
-${HttpServletRequest.BASIC_AUTH}
+${MappingMatch.CONTEXT_ROOT}
diff --git a/jsp/src/main/resources/com/sun/ts/tests/signaturetest/jsp/jakarta.servlet.jsp.sig_4.0 b/jsp/src/main/resources/com/sun/ts/tests/signaturetest/jsp/jakarta.servlet.jsp.sig_4.0
index 8225fea1c5..16bf437b7f 100644
--- a/jsp/src/main/resources/com/sun/ts/tests/signaturetest/jsp/jakarta.servlet.jsp.sig_4.0
+++ b/jsp/src/main/resources/com/sun/ts/tests/signaturetest/jsp/jakarta.servlet.jsp.sig_4.0
@@ -22,14 +22,15 @@ meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet
 CLSS public final jakarta.servlet.jsp.ErrorData
 cons public init(java.lang.Throwable,int,java.lang.String,java.lang.String)
  anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="4.0")
-cons public init(java.lang.Throwable,int,java.lang.String,java.lang.String,java.lang.String)
+cons public init(java.lang.Throwable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String)
 meth public int getStatusCode()
+meth public java.lang.String getMethod()
 meth public java.lang.String getQueryString()
 meth public java.lang.String getRequestURI()
 meth public java.lang.String getServletName()
 meth public java.lang.Throwable getThrowable()
 supr java.lang.Object
-hfds queryString,servletName,statusCode,throwable,uri
+hfds method,queryString,servletName,statusCode,throwable,uri
 
 CLSS public abstract interface jakarta.servlet.jsp.HttpJspPage
 intf jakarta.servlet.jsp.JspPage
diff --git a/jsp/src/main/resources/jakarta.servlet.jsp.sig_4.0 b/jsp/src/main/resources/jakarta.servlet.jsp.sig_4.0
index 8225fea1c5..16bf437b7f 100644
--- a/jsp/src/main/resources/jakarta.servlet.jsp.sig_4.0
+++ b/jsp/src/main/resources/jakarta.servlet.jsp.sig_4.0
@@ -22,14 +22,15 @@ meth public abstract void service(jakarta.servlet.ServletRequest,jakarta.servlet
 CLSS public final jakarta.servlet.jsp.ErrorData
 cons public init(java.lang.Throwable,int,java.lang.String,java.lang.String)
  anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="4.0")
-cons public init(java.lang.Throwable,int,java.lang.String,java.lang.String,java.lang.String)
+cons public init(java.lang.Throwable,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String)
 meth public int getStatusCode()
+meth public java.lang.String getMethod()
 meth public java.lang.String getQueryString()
 meth public java.lang.String getRequestURI()
 meth public java.lang.String getServletName()
 meth public java.lang.Throwable getThrowable()
 supr java.lang.Object
-hfds queryString,servletName,statusCode,throwable,uri
+hfds method,queryString,servletName,statusCode,throwable,uri
 
 CLSS public abstract interface jakarta.servlet.jsp.HttpJspPage
 intf jakarta.servlet.jsp.JspPage