diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 66a9094..73289a6 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -23,6 +23,8 @@ permissions:
   security-events: read
   contents: write
   actions: read
+  id-token: write
+  checks: write
 
 jobs:
   build:
@@ -37,27 +39,27 @@ jobs:
 
     steps:
 
-#      - name: Checkout Arquillian
-#        uses: actions/checkout@v3
-#        with:
-#          repository: 'arquillian/arquillian-container-jetty'
-#          ref: 'master'
-#
-#      - name: Set up JDK
-#        uses: actions/setup-java@v3
-#        with:
-#          java-version: 17
-#          distribution: 'temurin'
-#          cache: 'maven'
-#
-#      - name: Build Arquillian with Maven
-#        run: mvn install -B -U
+      #      - name: Checkout Arquillian
+      #        uses: actions/checkout@v3
+      #        with:
+      #          repository: 'arquillian/arquillian-container-jetty'
+      #          ref: 'master'
+
+      #      - name: Set up JDK
+      #        uses: actions/setup-java@v3
+      #        with:
+      #          java-version: 17
+      #          distribution: 'temurin'
+      #          cache: 'maven'
+
+      #      - name: Build Arquillian with Maven
+      #        run: mvn install -B -U
 
       - name: Checkout Servlet TCK
         uses: actions/checkout@v3
         with:
-          repository: 'olamy/jakartaee-tck'
-          ref: 'tckrefactor'
+          repository: 'jakartaee/servlet'
+          ref: 'master'
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -66,15 +68,27 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Install legacy javatest jar
-        run: mvn  -ntp install:install-file -Dfile=./lib/javatest.jar -DgroupId=javatest -DartifactId=javatest -Dversion=5.0 -Dpackaging=jar
+      - name: Set up Maven
+        run:
+          mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=3.9.5
 
       - name: Build Servlet TCK with Maven
-        run: mvn -V -B -U -pl :servlet -am clean install -DskipTests -e  -B -U
+        run: ./mvnw -V -B -U clean install -DskipTests -e  -B -U
 
       - name: Checkout TCK Run
         uses: actions/checkout@v3
 
+      - name: Set up Maven
+        run:
+          mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.2.0:wrapper -Dmaven=3.9.5
+
       - name: Build TCK Run with Maven
-        run: mvn -V -B -U -am clean verify -e  -B -Dmaven.test.failure.ignore=true
+        run: ./mvnw -V -B -U -am clean verify -e  -B -Dmaven.test.failure.ignore=true
 
+      - name: Publish Test Report
+        uses: dorny/test-reporter@v1
+        with:
+          name: Tests Report
+          path: '**/target/surefire-reports/TEST-**.xml'
+          reporter: java-junit
+          fail-on-error: false
diff --git a/Jenkinsfile b/Jenkinsfile
index 6049feb..e461576 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,42 +2,47 @@
 
 pipeline {
   agent { node { label 'linux' } }
-  triggers {
-    upstream(upstreamProjects: 'tck//tck-olamy-github-tck-run-module-glassfish/') //, threshold: hudson.model.Result.SUCCESS)
+  tools {
+    maven 'maven3'
   }
+//  triggers {
+//    upstream(upstreamProjects: 'tck/tck-olamy-github-tck-run-module-glassfish') //, threshold: hudson.model.Result.SUCCESS)
+//  }
   options {
     buildDiscarder logRotator( numToKeepStr: '50' )
   }
   parameters {
-    string( defaultValue: 'tckrefactor', description: 'GIT branch name to build TCK (master/tckrefactor)',
+    string( defaultValue: 'master', description: 'GIT branch name to build TCK (master/tck)',
             name: 'TCK_BRANCH' )
 
+    choice( description: 'TCK Github org',
+            name: 'GITHUB_ORG_TCK',
+            choices: ['jakartaee','olamy'])
+
     string( defaultValue: 'jetty-12.0.x', description: 'GIT branch name to build Jetty (jetty-12.0.x)',
             name: 'JETTY_BRANCH' )
 
-    string( defaultValue: 'master', description: 'GIT branch name to build arquillian Jetty (master/tck-all-changes)',
-            name: 'ARQUILLIAN_JETTY_BRANCH' )
-
     string( defaultValue: 'SNAPSHOT', description: 'Jetty Version',
             name: 'JETTY_VERSION' )
 
-    choice(
-            description: 'Arquillian Github org',
+    choice( description: 'Arquillian Github org',
             name: 'GITHUB_ORG_ARQUILLIAN',
             choices: ['arquillian','olamy'] )
 
-    choice(
-            description: 'TCK Github org',
-            name: 'GITHUB_ORG_TCK',
-            choices: ['jakartaee','olamy']
-    )
+    string( defaultValue: 'master', description: 'GIT branch name to build arquillian Jetty (master/tck-all-changes)',
+            name: 'ARQUILLIAN_JETTY_BRANCH' )
+
     string( defaultValue: 'jdk17', description: 'JDK to build Jetty', name: 'JDKBUILD' )
+
+    string( defaultValue: '', description: 'Extra Maven Args', name: 'MVN_ARGS' )
+
   }
 
   stages {
 
-    //stage('Build External') {
-      //parallel {
+    stage('Build External') {
+      parallel {
+
         stage("Checkout Build Jetty 12.0.x") {
           steps {
             ws('jetty') {
@@ -48,10 +53,10 @@ pipeline {
                         userRemoteConfigs: [[url: 'https://github.com/eclipse/jetty.project.git']]])
               timeout(time: 45, unit: 'MINUTES') {
                 withEnv(["JAVA_HOME=${tool "$JDKBUILD"}",
-                         "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool "maven3"}/bin",
+                         "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool 'maven3'}/bin",
                          "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
                   configFileProvider([configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
-                    sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -V -B -U clean install -T5 -e -Pfast"
+                    sh "mvn -ntp -s $GLOBAL_MVN_SETTINGS -V -B -U clean install -T5 -e -DskipTests -Dmaven.build.cache.restoreGeneratedSources=false -Dmaven.build.cache.remote.url=dav:http://nginx-cache-service.jenkins.svc.cluster.local:80 -Dmaven.build.cache.remote.enabled=true -Dmaven.build.cache.remote.save.enabled=true -Dmaven.build.cache.remote.server.id=remote-build-cache-server"
                     script {
                       if (JETTY_VERSION == "SNAPSHOT") {
                         def model = readMavenPom file: 'pom.xml'
@@ -64,6 +69,7 @@ pipeline {
             }
           }
         }
+
 //        stage("Checkout Build Arquillian Jetty") {
 //          steps {
 //            ws('arquillian') {
@@ -74,10 +80,10 @@ pipeline {
 //                        userRemoteConfigs: [[url: 'https://github.com/${GITHUB_ORG_ARQUILLIAN}/arquillian-container-jetty']]])
 //              timeout(time: 30, unit: 'MINUTES') {
 //                withEnv(["JAVA_HOME=${tool "$JDKBUILD"}",
-//                         "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool "maven3"}/bin",
+//                         "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool 'maven3'}/bin",
 //                         "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
 //                  configFileProvider([configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
-//                    sh "mvn --no-transfer-progress -s $GLOBAL_MVN_SETTINGS -V -B -U clean install -DskipTests -T3 -e -Denforcer.skip=true"
+//                    sh "mvn -ntp -s $GLOBAL_MVN_SETTINGS -V -B -U clean install -DskipTests -T3 -e -Denforcer.skip=true"
 //                  }
 //                }
 //              }
@@ -85,23 +91,24 @@ pipeline {
 //          }
 //        }
 
-      //}
-    //}
+
+      }
+    }
     stage("Checkout Build TCK Sources") {
       steps {
-        ws('arquillian') {
+        ws('tck') {
           deleteDir()
           checkout([$class: 'GitSCM',
                     branches: [[name: "*/$TCK_BRANCH"]],
                     extensions: [[$class: 'CloneOption', depth: 1, noTags: true, shallow: true]],
-                    userRemoteConfigs: [[url: 'https://github.com/${GITHUB_ORG_TCK}/platform-tck']]])
+                    userRemoteConfigs: [[url: 'https://github.com/${GITHUB_ORG_TCK}/servlet']]])
           timeout(time: 30, unit: 'MINUTES') {
             withEnv(["JAVA_HOME=${tool "$JDKBUILD"}",
-                     "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool "maven3"}/bin",
+                     "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool 'maven3'}/bin",
                      "MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
               configFileProvider([configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
-                sh "mvn -ntp install:install-file -Dfile=./lib/javatest.jar -DgroupId=javatest -DartifactId=javatest -Dversion=5.0 -Dpackaging=jar"
-                sh "mvn -ntp -s $GLOBAL_MVN_SETTINGS -V -B -U -pl :servlet -am clean install -DskipTests -e"
+                //sh "mvn -ntp install:install-file -Dfile=./lib/javatest.jar -DgroupId=javatest -DartifactId=javatest -Dversion=5.0 -Dpackaging=jar"
+                sh "mvn -ntp -s $GLOBAL_MVN_SETTINGS -V -B clean install -e -Dmaven.build.cache.remote.url=dav:http://nginx-cache-service.jenkins.svc.cluster.local:80 -Dmaven.build.cache.remote.enabled=true -Dmaven.build.cache.remote.save.enabled=true -Dmaven.build.cache.remote.server.id=remote-build-cache-server"
               }
             }
           }
@@ -113,10 +120,10 @@ pipeline {
       steps {
         timeout(time: 90, unit: 'MINUTES') {
           withEnv(["JAVA_HOME=${tool "$JDKBUILD"}",
-                   "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool "maven3"}/bin",
+                   "PATH+MAVEN=${env.JAVA_HOME}/bin:${tool 'maven3'}/bin",
                    "MAVEN_OPTS=-Xms4g -Xmx8g -Djava.awt.headless=true"]) {
             configFileProvider([configFile(fileId: 'oss-settings.xml', variable: 'GLOBAL_MVN_SETTINGS')]) {
-              sh "mvn -nsu -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.test.failure.ignore=true -V -B -U clean verify -e -Djetty.version=$JETTY_VERSION"
+              sh "mvn -nsu -ntp -s $GLOBAL_MVN_SETTINGS -Dmaven.test.failure.ignore=true -V -B -U clean verify -e -Djetty.version=$JETTY_VERSION $MVN_ARGS"
             }
           }
         }
diff --git a/pom.xml b/pom.xml
index 85b4ebd..b420995 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.eclipse.jetty.tck</groupId>
@@ -16,14 +16,22 @@
     <maven.compiler.release>11</maven.compiler.release>
     <junit.version>5.10.0</junit.version>
     <slf4j.version>2.0.7</slf4j.version>
-    <arquillian.core.version>1.7.0.Alpha14</arquillian.core.version> <!-- 1.7.0.Final-SNAPSHOT -->
     <arquillian.jetty.version>2.0.0.Final</arquillian.jetty.version>
     <arquillian.jetty.artifactId>arquillian-jetty-embedded-12-ee9</arquillian.jetty.artifactId>
-    <jetty.version>12.0.0</jetty.version> <!-- 11.0.9-SNAPSHOT -->
-    <surefire.version>3.1.0</surefire.version> <!-- 3.0.0-M7-SNAPSHOT -->
-    <jakarta.tck.version>10.0.0-SNAPSHOT</jakarta.tck.version>
+    <jetty.version>12.0.2-SNAPSHOT</jetty.version> <!-- 11.0.9-SNAPSHOT -->
+    <surefire.version>3.0.0</surefire.version> <!-- 3.0.0-M7-SNAPSHOT -->
+    <jakarta.tck.version>6.1.0-SNAPSHOT</jakarta.tck.version>
+    <servlet.api.version>6.0.0</servlet.api.version>
     <fork.argLine>-Xmx8g -Xms4g</fork.argLine>
     <http2.timeout></http2.timeout>
+
+
+    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>
+    <junit.jupiter.execution.parallel.mode.default>same_thread</junit.jupiter.execution.parallel.mode.default>
+    <junit.jupiter.execution.parallel.mode.classes.default>concurrent</junit.jupiter.execution.parallel.mode.classes.default>
+    <junit.jupiter.execution.parallel.config.strategy>fixed</junit.jupiter.execution.parallel.config.strategy>
+    <junit.jupiter.execution.parallel.config.fixed.parallelism>2</junit.jupiter.execution.parallel.config.fixed.parallelism>
+    <junit.jupiter.extensions.autodetection.enabled>false</junit.jupiter.extensions.autodetection.enabled>
   </properties>
 
   <dependencyManagement>
@@ -49,13 +57,34 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.jboss.arquillian</groupId>
+        <artifactId>arquillian-bom</artifactId>
+        <version>1.7.1.Final</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.shrinkwrap</groupId>
+        <artifactId>shrinkwrap-bom</artifactId>
+        <version>1.2.6</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.shrinkwrap.resolver</groupId>
+        <artifactId>shrinkwrap-resolver-bom</artifactId>
+        <version>3.2.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <dependencies>
     <dependency>
-      <groupId>jakartatck</groupId>
-      <artifactId>servlet</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>tck-runtime</artifactId>
       <version>${jakarta.tck.version}</version>
       <exclusions>
         <exclusion>
@@ -68,6 +97,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>${servlet.api.version}</version>
+    </dependency>
+    <!--    <dependency>-->
+    <!--      <groupId>jakarta.servlet</groupId>-->
+    <!--      <artifactId>tck-util</artifactId>-->
+    <!--      <version>${jakarta.tck.version}</version>-->
+    <!--    </dependency>-->
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>${arquillian.jetty.artifactId}</artifactId>
@@ -114,17 +153,6 @@
       <artifactId>jetty-ee9-glassfish-jstl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>jakartatck</groupId>
-      <artifactId>libutil</artifactId>
-      <version>${jakarta.tck.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.glassfish.metro</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -148,58 +176,57 @@
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>arquillian-container-test-spi</artifactId>
-      <version>${arquillian.core.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.junit5</groupId>
       <artifactId>arquillian-junit5-container</artifactId>
-      <version>${arquillian.core.version}</version>
       <scope>test</scope>
     </dependency>
 
     <!-- just make Intellij/jpms happy when having all the projects together -->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-slf4j-impl</artifactId>-->
-<!--      <version>${jetty.version}</version>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-jmx</artifactId>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-util-ajax</artifactId>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-client</artifactId>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-webapp</artifactId>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-xml</artifactId>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty</groupId>-->
-<!--      <artifactId>jetty-util</artifactId>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.eclipse.jetty.tests</groupId>-->
-<!--      <artifactId>jetty-http-tools</artifactId>-->
-<!--      <version>${jetty.version}</version>-->
-<!--      <scope>compile</scope>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-slf4j-impl</artifactId>
+      <version>${jetty.version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <!--    <dependency>-->
+    <!--      <groupId>org.eclipse.jetty</groupId>-->
+    <!--      <artifactId>jetty-webapp</artifactId>-->
+    <!--      <scope>compile</scope>-->
+    <!--    </dependency>-->
+    <!--    <dependency>-->
+    <!--      <groupId>org.eclipse.jetty</groupId>-->
+    <!--      <artifactId>jetty-xml</artifactId>-->
+    <!--      <scope>compile</scope>-->
+    <!--    </dependency>-->
+    <!--    <dependency>-->
+    <!--      <groupId>org.eclipse.jetty</groupId>-->
+    <!--      <artifactId>jetty-util</artifactId>-->
+    <!--      <scope>compile</scope>-->
+    <!--    </dependency>-->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http-tools</artifactId>
+      <version>${jetty.version}</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -234,16 +261,29 @@
               -Djavax.net.ssl.trustStore=${project.build.directory}/cacerts.jks</argLine>
             <forkedProcessTimeoutInSeconds>15000</forkedProcessTimeoutInSeconds>
             <dependenciesToScan>
-              <dependenciesToScan>jakartatck:servlet</dependenciesToScan>
+              <dependenciesToScan>jakarta.servlet:tck-runtime</dependenciesToScan>
             </dependenciesToScan>
             <systemProperties>
               <http2.timeout>${http2.timeout}</http2.timeout>
             </systemProperties>
-            <includes>
-              <include>**/URLClient*</include>
-              <include>**/Client*</include>
-            </includes>
+            <!--            <includes>-->
+            <!--              <include>**/URLClient*</include>-->
+            <!--              <include>**/Client*</include>-->
+            <!--            </includes>-->
+            <!--            <excludes>-->
+            <!--              <exclude>**/BaseUrlClient</exclude>-->
+            <!--            </excludes>-->
             <trimStackTrace>false</trimStackTrace>
+            <properties>
+              <configurationParameters>
+                junit.jupiter.execution.parallel.enabled=${junit.jupiter.execution.parallel.enabled}
+                junit.jupiter.execution.parallel.mode.default=${junit.jupiter.execution.parallel.mode.default}
+                junit.jupiter.execution.parallel.mode.classes.default=${junit.jupiter.execution.parallel.mode.classes.default}
+                junit.jupiter.execution.parallel.config.strategy=${junit.jupiter.execution.parallel.config.strategy}
+                junit.jupiter.execution.parallel.config.fixed.parallelism=${junit.jupiter.execution.parallel.config.fixed.parallelism}
+                junit.jupiter.extensions.autodetection.enabled=${junit.jupiter.extensions.autodetection.enabled}
+              </configurationParameters>
+            </properties>
           </configuration>
         </plugin>
         <plugin>
@@ -268,8 +308,8 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>jakartatck</groupId>
-                  <artifactId>libutil</artifactId>
+                  <groupId>jakarta.servlet</groupId>
+                  <artifactId>tck-runtime</artifactId>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.testOutputDirectory}/</outputDirectory>
diff --git a/src/test/java/org/eclipse/jetty/tck/AppTest.java b/src/test/java/org/eclipse/jetty/tck/AppTest.java
index 25165ba..91f6d60 100644
--- a/src/test/java/org/eclipse/jetty/tck/AppTest.java
+++ b/src/test/java/org/eclipse/jetty/tck/AppTest.java
@@ -1,17 +1,19 @@
 package org.eclipse.jetty.tck;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.slf4j.LoggerFactory;
+import servlet.tck.api.jakarta_servlet.servletrequest.ServletRequestTests;
 
 /**
  * Unit test for simple App.
  */
-public class AppTest extends com.sun.ts.tests.servlet.spec.security.secform.Client // com.sun.ts.tests.servlet.api.jakarta_servlet_http.httpsessionx.URLClient
+@Disabled
+public class AppTest extends ServletRequestTests
 {
 
     @Test
     public void foo() throws Exception {
-        super.test1();
+        super.setCharacterEncodingTest1();
     }
 
 }