diff --git a/jetty-core/jetty-openid/src/main/config/modules/openid.mod b/jetty-core/jetty-openid/src/main/config/modules/openid.mod
index 8a1a8265462..ddd36c8ec90 100644
--- a/jetty-core/jetty-openid/src/main/config/modules/openid.mod
+++ b/jetty-core/jetty-openid/src/main/config/modules/openid.mod
@@ -47,4 +47,4 @@ etc/jetty-openid.xml
 # jetty.openid.authenticationMethod=client_secret_post
 
 ## Whether the user should be logged out after the idToken expires.
-# jetty.openid.logoutWhenIdTokenIsExpired=false
\ No newline at end of file
+# jetty.openid.logoutWhenIdTokenIsExpired=false
diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml
index ff07af0abe3..4684c12ffcc 100644
--- a/jetty-ee10/jetty-ee10-home/pom.xml
+++ b/jetty-ee10/jetty-ee10-home/pom.xml
@@ -18,11 +18,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-openid</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-openid.mod b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-openid.mod
deleted file mode 100644
index bcddc284d2e..00000000000
--- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-openid.mod
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT THIS FILE - See: https://eclipse.dev/jetty/documentation/
-
-[description]
-Adds openid security for EE10.
-
-[environment]
-ee10
-
-[depend]
-openid
diff --git a/jetty-ee8/jetty-ee8-openid/src/main/config/etc/jetty-ee8-openid.xml b/jetty-ee8/jetty-ee8-openid/src/main/config/etc/jetty-ee8-openid.xml
deleted file mode 100644
index 42c9c7ff14b..00000000000
--- a/jetty-ee8/jetty-ee8-openid/src/main/config/etc/jetty-ee8-openid.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Get id="ThreadPool" name="threadPool"/>
-  <New id="HttpClient" class="org.eclipse.jetty.client.HttpClient">
-    <Arg>
-      <New class="org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP">
-        <Arg>
-          <New class="org.eclipse.jetty.io.ClientConnector">
-            <Set name="sslContextFactory">
-              <New class="org.eclipse.jetty.util.ssl.SslContextFactory$Client">
-                <Set name="trustAll" type="boolean">
-                  <Property name="jetty.openid.sslContextFactory.trustAll" default="false"/>
-                </Set>
-              </New>
-            </Set>
-          </New>
-        </Arg>
-      </New>
-    </Arg>
-    <Set name="executor"><Ref refid="ThreadPool"/></Set>
-  </New>
-  <Call name="addBean">
-    <Arg>
-      <Ref refid="BaseLoginService"/>
-    </Arg>
-  </Call>
-  <Call name="addBean">
-    <Arg>
-      <New id="OpenIdConfiguration" class="org.eclipse.jetty.ee8.security.openid.OpenIdConfiguration">
-        <Arg name="issuer"><Property name="jetty.openid.provider" deprecated="jetty.openid.openIdProvider"/></Arg>
-        <Arg name="authorizationEndpoint"><Property name="jetty.openid.provider.authorizationEndpoint"/></Arg>
-        <Arg name="tokenEndpoint"><Property name="jetty.openid.provider.tokenEndpoint"/></Arg>
-        <Arg name="clientId"><Property name="jetty.openid.clientId"/></Arg>
-        <Arg name="clientSecret"><Property name="jetty.openid.clientSecret"/></Arg>
-        <Arg name="authMethod"><Property name="jetty.openid.authenticationMethod" deprecated="jetty.openid.authMethod" default="client_secret_post"/></Arg>
-        <Arg name="httpClient"><Ref refid="HttpClient"/></Arg>
-        <Set name="authenticateNewUsers">
-          <Property name="jetty.openid.authenticateNewUsers" default="false"/>
-        </Set>
-        <Call name="addScopes">
-          <Arg>
-            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-              <Arg><Property name="jetty.openid.scopes"/></Arg>
-            </Call>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod
index 6cf9d3a83a8..b68eb35ac3d 100644
--- a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod
+++ b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod
@@ -3,46 +3,12 @@
 [description]
 Adds OpenId Connect authentication to the server.
 
+[environment]
+ee8
+
 [depend]
 ee8-security
 openid
-client
 
 [lib]
 lib/jetty-ee8-openid-${jetty.version}.jar
-lib/jetty-util-ajax-${jetty.version}.jar
-
-[files]
-basehome:modules/openid/jetty-ee8-openid-baseloginservice.xml|etc/openid-baseloginservice.xml
-
-[xml]
-etc/openid-baseloginservice.xml
-etc/jetty-ee8-openid.xml
-
-[ini-template]
-## The OpenID Identity Provider's issuer ID (the entire URL *before* ".well-known/openid-configuration")
-# jetty.openid.provider=https://id.example.com/
-
-## The OpenID Identity Provider's authorization endpoint (optional if the metadata of the OP is accessible)
-# jetty.openid.provider.authorizationEndpoint=https://id.example.com/authorization
-
-## The OpenID Identity Provider's token endpoint (optional if the metadata of the OP is accessible)
-# jetty.openid.provider.tokenEndpoint=https://id.example.com/token
-
-## The Client Identifier
-# jetty.openid.clientId=test1234
-
-## The Client Secret
-# jetty.openid.clientSecret=XT_Mafv_aUCGheuCaKY8P
-
-## Additional Scopes to Request
-# jetty.openid.scopes=email,profile
-
-## Whether to Authenticate users not found by base LoginService
-# jetty.openid.authenticateNewUsers=false
-
-## True if all certificates should be trusted by the default SslContextFactory
-# jetty.openid.sslContextFactory.trustAll=false
-
-## What authentication method to use with the Token Endpoint (client_secret_post, client_secret_basic).
-# jetty.openid.authenticationMethod=client_secret_post
diff --git a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/openid/jetty-ee8-openid-baseloginservice.xml b/jetty-ee8/jetty-ee8-openid/src/main/config/modules/openid/jetty-ee8-openid-baseloginservice.xml
deleted file mode 100644
index 1773ebd46db..00000000000
--- a/jetty-ee8/jetty-ee8-openid/src/main/config/modules/openid/jetty-ee8-openid-baseloginservice.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-<Configure>
-  <!-- Optional code to configure the base LoginService used by the OpenIdLoginService
-  <New id="BaseLoginService" class="org.eclipse.jetty.security.HashLoginService">
-    <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
-    <Set name="hotReload">true</Set>
-  </New>
-  -->
-</Configure>
\ No newline at end of file
diff --git a/jetty-ee9/jetty-ee9-openid/src/main/config/etc/jetty-ee9-openid.xml b/jetty-ee9/jetty-ee9-openid/src/main/config/etc/jetty-ee9-openid.xml
deleted file mode 100644
index ed1fdd3331d..00000000000
--- a/jetty-ee9/jetty-ee9-openid/src/main/config/etc/jetty-ee9-openid.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-  <Get id="ThreadPool" name="threadPool"/>
-  <New id="HttpClient" class="org.eclipse.jetty.client.HttpClient">
-    <Arg>
-      <New class="org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP">
-        <Arg>
-          <New class="org.eclipse.jetty.io.ClientConnector">
-            <Set name="sslContextFactory">
-              <New class="org.eclipse.jetty.util.ssl.SslContextFactory$Client">
-                <Set name="trustAll" type="boolean">
-                  <Property name="jetty.openid.sslContextFactory.trustAll" default="false"/>
-                </Set>
-              </New>
-            </Set>
-          </New>
-        </Arg>
-      </New>
-    </Arg>
-    <Set name="executor"><Ref refid="ThreadPool"/></Set>
-  </New>
-  <Call name="addBean">
-    <Arg>
-      <Ref refid="BaseLoginService"/>
-    </Arg>
-  </Call>
-  <Call name="addBean">
-    <Arg>
-      <New id="OpenIdConfiguration" class="org.eclipse.jetty.security.openid.OpenIdConfiguration">
-        <Arg name="issuer"><Property name="jetty.openid.provider" deprecated="jetty.openid.openIdProvider"/></Arg>
-        <Arg name="authorizationEndpoint"><Property name="jetty.openid.provider.authorizationEndpoint"/></Arg>
-        <Arg name="tokenEndpoint"><Property name="jetty.openid.provider.tokenEndpoint"/></Arg>
-        <Arg name="clientId"><Property name="jetty.openid.clientId"/></Arg>
-        <Arg name="clientSecret"><Property name="jetty.openid.clientSecret"/></Arg>
-        <Arg name="authMethod"><Property name="jetty.openid.authenticationMethod" deprecated="jetty.openid.authMethod" default="client_secret_post"/></Arg>
-        <Arg name="httpClient"><Ref refid="HttpClient"/></Arg>
-        <Set name="authenticateNewUsers">
-          <Property name="jetty.openid.authenticateNewUsers" default="false"/>
-        </Set>
-        <Set name="logoutWhenIdTokenIsExpired">
-          <Property name="jetty.openid.logoutWhenIdTokenIsExpired" default="false"/>
-        </Set>
-        <Call name="addScopes">
-          <Arg>
-            <Call class="org.eclipse.jetty.util.StringUtil" name="csvSplit">
-              <Arg><Property name="jetty.openid.scopes"/></Arg>
-            </Call>
-          </Arg>
-        </Call>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod
index 1ff2509f2e5..d86a075bc8b 100644
--- a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod
+++ b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod
@@ -9,46 +9,6 @@ ee9
 [depend]
 ee9-security
 openid
-client
 
 [lib]
 lib/jetty-ee9-openid-${jetty.version}.jar
-lib/jetty-util-ajax-${jetty.version}.jar
-
-[files]
-basehome:modules/openid/jetty-ee9-openid-baseloginservice.xml|etc/openid-baseloginservice.xml
-
-[xml]
-etc/openid-baseloginservice.xml
-etc/jetty-ee9-openid.xml
-
-[ini-template]
-## The OpenID Identity Provider's issuer ID (the entire URL *before* ".well-known/openid-configuration")
-# jetty.openid.provider=https://id.example.com/
-
-## The OpenID Identity Provider's authorization endpoint (optional if the metadata of the OP is accessible)
-# jetty.openid.provider.authorizationEndpoint=https://id.example.com/authorization
-
-## The OpenID Identity Provider's token endpoint (optional if the metadata of the OP is accessible)
-# jetty.openid.provider.tokenEndpoint=https://id.example.com/token
-
-## The Client Identifier
-# jetty.openid.clientId=test1234
-
-## The Client Secret
-# jetty.openid.clientSecret=XT_Mafv_aUCGheuCaKY8P
-
-## Additional Scopes to Request
-# jetty.openid.scopes=email,profile
-
-## Whether to Authenticate users not found by base LoginService
-# jetty.openid.authenticateNewUsers=false
-
-## True if all certificates should be trusted by the default SslContextFactory
-# jetty.openid.sslContextFactory.trustAll=false
-
-## What authentication method to use with the Token Endpoint (client_secret_post, client_secret_basic).
-# jetty.openid.authenticationMethod=client_secret_post
-
-## Whether the user should be logged out after the idToken expires.
-# jetty.openid.logoutWhenIdTokenIsExpired=false
diff --git a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/openid/jetty-ee9-openid-baseloginservice.xml b/jetty-ee9/jetty-ee9-openid/src/main/config/modules/openid/jetty-ee9-openid-baseloginservice.xml
deleted file mode 100644
index 1773ebd46db..00000000000
--- a/jetty-ee9/jetty-ee9-openid/src/main/config/modules/openid/jetty-ee9-openid-baseloginservice.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-<Configure>
-  <!-- Optional code to configure the base LoginService used by the OpenIdLoginService
-  <New id="BaseLoginService" class="org.eclipse.jetty.security.HashLoginService">
-    <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
-    <Set name="hotReload">true</Set>
-  </New>
-  -->
-</Configure>
\ No newline at end of file
diff --git a/tests/test-distribution/test-ee9-distribution/src/test/java/org/eclipse/jetty/ee9/tests/distribution/OpenIdTests.java b/tests/test-distribution/test-ee9-distribution/src/test/java/org/eclipse/jetty/ee9/tests/distribution/OpenIdTests.java
index 410dd07f49c..78744609f36 100644
--- a/tests/test-distribution/test-ee9-distribution/src/test/java/org/eclipse/jetty/ee9/tests/distribution/OpenIdTests.java
+++ b/tests/test-distribution/test-ee9-distribution/src/test/java/org/eclipse/jetty/ee9/tests/distribution/OpenIdTests.java
@@ -22,8 +22,8 @@ import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.tests.distribution.AbstractJettyHomeTest;
 import org.eclipse.jetty.tests.testers.JettyHomeTester;
 import org.eclipse.jetty.tests.testers.Tester;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
@@ -31,11 +31,10 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@Isolated
 public class OpenIdTests extends AbstractJettyHomeTest
 {
     @Test
-    // FIXME
-    @Disabled
     public void testOpenID() throws Exception
     {
         Path jettyBase = newTestJettyBaseDirectory();