diff --git a/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/AbstractSessionDataStoreTest.java b/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/AbstractSessionDataStoreTest.java
index 264cb88e190..73d064b7433 100644
--- a/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/AbstractSessionDataStoreTest.java
+++ b/jetty-core/jetty-session/src/test/java/org/eclipse/jetty/session/AbstractSessionDataStoreTest.java
@@ -94,7 +94,7 @@ public abstract class AbstractSessionDataStoreTest
     /**
      * Cannot be a BeforeEach, because this 
      * BeforeEach is executed before the subclass one, but it
-     * one relies on BeforeEach behaviour in the subclass!
+     * relies on BeforeEach behaviour in the subclass!
      */
     public void setUp()
     {
diff --git a/jetty-ee9/test-ee9-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/pom.xml
index 68fab4ae8df..e43018cef33 100644
--- a/jetty-ee9/test-ee9-sessions/pom.xml
+++ b/jetty-ee9/test-ee9-sessions/pom.xml
@@ -15,10 +15,10 @@
     <module>test-ee9-file-sessions</module>
     <module>test-ee9-jdbc-sessions</module>
     <module>test-ee9-mongodb-sessions</module>
-    <!-- module>test-ee9-infinispan-sessions</module -->
-    <!-- module>test-ee9-gcloud-sessions</module -->
-    <!-- module>test-ee9-memcached-sessions</module -->
-    <!-- module>test-ee9-hazelcast-sessions</module -->
+    <module>test-ee9-infinispan-sessions</module>
+    <module>test-ee9-gcloud-sessions</module>
+    <module>test-ee9-memcached-sessions</module>
+    <module>test-ee9-hazelcast-sessions</module>
   </modules>
   <dependencyManagement>
     <dependencies>
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml
index baa32256b7d..4c3c4f6f44c 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.eclipse.jetty.ee9</groupId>
     <artifactId>test-ee9-sessions</artifactId>
     <version>12.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>test-ee9-gcloud-sessions</artifactId>
   <name>Jetty EE9 Tests :: Sessions :: GCloud</name>
@@ -29,6 +30,12 @@
       <artifactId>jetty-session</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-session</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-webapp</artifactId>
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java
index 0ed91d55ab7..160d6d639bd 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredOrphanedSessionTest.java
@@ -13,15 +13,17 @@
 
 package org.eclipse.jetty.gcloud.session;
 
-import org.eclipse.jetty.session.AbstractClusteredOrphanedSessionTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /**
  * ClusteredOrphanedSessionTest
  */
+@Disabled
 @Testcontainers(disabledWithoutDocker = true)
 public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java
index 04404362fd2..7fb7b9d053d 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/ClusteredSessionScavengingTest.java
@@ -13,15 +13,17 @@
 
 package org.eclipse.jetty.gcloud.session;
 
-import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /**
  * ClusteredSessionScavengingTest
  */
+@Disabled
 @Testcontainers(disabledWithoutDocker = true)
 public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java
index 9824167fc34..3b51c9751dd 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionDataStoreTest.java
@@ -36,7 +36,7 @@ public class GCloudSessionDataStoreTest extends AbstractSessionDataStoreTest
     public static GCloudSessionTestSupport __testSupport;
 
     @BeforeAll
-    public static void setUp() throws Exception
+    public static void configure() throws Exception
     {
         __testSupport = new GCloudSessionTestSupport();
         __testSupport.setUp();
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java
index ac0e9be8d5a..bf497afa4cd 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java
@@ -41,7 +41,7 @@ import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
 import org.eclipse.jetty.gcloud.session.GCloudSessionDataStore.EntityDataModel;
 import org.eclipse.jetty.session.SessionData;
 import org.eclipse.jetty.session.SessionDataStore;
-import org.eclipse.jetty.session.SessionHandler;
+import org.eclipse.jetty.session.SessionManager;
 import org.eclipse.jetty.util.ClassLoadingObjectInputStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -98,9 +98,9 @@ public class GCloudSessionTestSupport
         }
 
         @Override
-        public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception
+        public SessionDataStore getSessionDataStore(SessionManager manager) throws Exception
         {
-            GCloudSessionDataStore ds = (GCloudSessionDataStore)super.getSessionDataStore(handler);
+            GCloudSessionDataStore ds = (GCloudSessionDataStore)super.getSessionDataStore(manager);
             ds.setMaxRetries(GCloudSessionDataStore.DEFAULT_MAX_RETRIES);
             ds.setDatastore(_d);
             return ds;
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java
index 8e25d4141ea..0b6cf741285 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/InvalidationSessionTest.java
@@ -13,15 +13,18 @@
 
 package org.eclipse.jetty.gcloud.session;
 
-import org.eclipse.jetty.session.AbstractClusteredInvalidationSessionTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredInvalidationSessionTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /**
  * InvalidationSessionTest
  */
+//TODO
+@Disabled
 @Testcontainers(disabledWithoutDocker = true)
 public class InvalidationSessionTest extends AbstractClusteredInvalidationSessionTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml
index c48b3b3e8ef..e68c5de326d 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.eclipse.jetty.ee9</groupId>
     <artifactId>test-ee9-sessions</artifactId>
     <version>12.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>test-ee9-hazelcast-sessions</artifactId>
   <name>Jetty EE9 Tests :: Sessions :: Hazelcast</name>
@@ -65,6 +66,12 @@
       <artifactId>jetty-session</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-session</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-webapp</artifactId>
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java
index 27df15ea69b..03764988a24 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredOrphanedSessionTest.java
@@ -13,14 +13,17 @@
 
 package org.eclipse.jetty.hazelcast.session;
 
-import org.eclipse.jetty.session.AbstractClusteredOrphanedSessionTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 
 /**
  * ClusteredOrphanedSessionTest
  */
+//TODO
+@Disabled
 public class ClusteredOrphanedSessionTest
     extends AbstractClusteredOrphanedSessionTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java
index 3941e2580f8..27397e533e3 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/ClusteredSessionScavengingTest.java
@@ -13,14 +13,17 @@
 
 package org.eclipse.jetty.hazelcast.session;
 
-import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 
 /**
  * ClusteredSessionScavengingTest
  */
+//TODO
+@Disabled
 public class ClusteredSessionScavengingTest
     extends AbstractClusteredSessionScavengingTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java
index 91fe1688424..e7d0ff092a3 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastClusteredInvalidationSessionTest.java
@@ -13,11 +13,14 @@
 
 package org.eclipse.jetty.hazelcast.session;
 
-import org.eclipse.jetty.session.AbstractClusteredInvalidationSessionTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredInvalidationSessionTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 
+//TODO
+@Disabled
 public class HazelcastClusteredInvalidationSessionTest
     extends AbstractClusteredInvalidationSessionTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
index 561e6f5d6cc..a571eadfc48 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
@@ -14,8 +14,10 @@
 package org.eclipse.jetty.hazelcast.session;
 
 import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
+import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.session.AbstractSessionDataStoreFactory;
 import org.eclipse.jetty.session.AbstractSessionDataStoreTest;
+import org.eclipse.jetty.session.DefaultSessionIdManager;
 import org.eclipse.jetty.session.SessionContext;
 import org.eclipse.jetty.session.SessionData;
 import org.eclipse.jetty.session.SessionDataStore;
@@ -46,7 +48,7 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
     }
 
     @BeforeEach
-    public void setUp()
+    public void configure()
     {
         _testHelper = new HazelcastTestHelper();
     }
@@ -107,13 +109,15 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
     @Test
     public void testLoadSessionFails() throws Exception
     {
+        DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
         // create the SessionDataStore
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/test");
+        context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
         SessionDataStoreFactory factory = createSessionDataStoreFactory();
         ((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
-        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
-        SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
+        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
+        SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
         store.initialize(sessionContext);
 
         // persist a session
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java
index 3d9fda5ffc5..aa63bd3147f 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientOrphanedSessionTest.java
@@ -13,12 +13,15 @@
 
 package org.eclipse.jetty.hazelcast.session.client;
 
+import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
 import org.eclipse.jetty.hazelcast.session.HazelcastTestHelper;
-import org.eclipse.jetty.session.AbstractClusteredOrphanedSessionTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 
+//TODO
+@Disabled
 public class ClientOrphanedSessionTest
     extends AbstractClusteredOrphanedSessionTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java
index 8d020d04087..0ea62ccc09e 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/ClientSessionScavengingTest.java
@@ -13,12 +13,15 @@
 
 package org.eclipse.jetty.hazelcast.session.client;
 
+import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
 import org.eclipse.jetty.hazelcast.session.HazelcastTestHelper;
-import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 
+//TODO
+@Disabled
 public class ClientSessionScavengingTest
     extends AbstractClusteredSessionScavengingTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java
index 63f27837900..4c2e4c62594 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/client/HazelcastSessionDataStoreTest.java
@@ -16,8 +16,10 @@ package org.eclipse.jetty.hazelcast.session.client;
 import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
 import org.eclipse.jetty.hazelcast.session.HazelcastSessionDataStore;
 import org.eclipse.jetty.hazelcast.session.HazelcastTestHelper;
+import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.session.AbstractSessionDataStoreFactory;
 import org.eclipse.jetty.session.AbstractSessionDataStoreTest;
+import org.eclipse.jetty.session.DefaultSessionIdManager;
 import org.eclipse.jetty.session.SessionContext;
 import org.eclipse.jetty.session.SessionData;
 import org.eclipse.jetty.session.SessionDataStore;
@@ -48,7 +50,7 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
     }
 
     @BeforeEach
-    public void setUp()
+    public void configure()
     {
         _testHelper = new HazelcastTestHelper();
     }
@@ -109,13 +111,15 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
     @Test
     public void testLoadSessionFails() throws Exception
     {
+        DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
         // create the SessionDataStore
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/test");
+        context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
         SessionDataStoreFactory factory = createSessionDataStoreFactory();
         ((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
-        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
-        SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
+        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
+        SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
         store.initialize(sessionContext);
 
         // persist a session
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
index b8da6b1d34d..aafc5d246e7 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.eclipse.jetty.ee9</groupId>
     <artifactId>test-ee9-sessions</artifactId>
     <version>12.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>test-ee9-infinispan-sessions</artifactId>
   <name>Jetty EE9 Tests :: Sessions :: Infinispan</name>
@@ -73,6 +74,12 @@
       <artifactId>jetty-session</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-session</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>jetty-ee9-webapp</artifactId>
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java
index 90564c09279..02a4a730a33 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredOrphanedSessionTest.java
@@ -13,16 +13,20 @@
 
 package org.eclipse.jetty.session;
 
+import org.eclipse.jetty.ee9.session.AbstractClusteredOrphanedSessionTest;
 import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
  * ClusteredOrphanedSessionTest
  */
+//TODO
+@Disabled
 @ExtendWith(WorkDirExtension.class)
 public class ClusteredOrphanedSessionTest extends AbstractClusteredOrphanedSessionTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java
index 2c5f503029d..a7d250cadf1 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSerializedSessionScavengingTest.java
@@ -13,17 +13,21 @@
 
 package org.eclipse.jetty.session;
 
+import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
 import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
  * ClusteredSerializedSessionScavengingTest
  */
+//TODO
+@Disabled
 @ExtendWith(WorkDirExtension.class)
 public class ClusteredSerializedSessionScavengingTest extends AbstractClusteredSessionScavengingTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java
index 9ea5668a3e4..1680527472e 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/ClusteredSessionScavengingTest.java
@@ -13,17 +13,21 @@
 
 package org.eclipse.jetty.session;
 
+import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
 import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
 import org.eclipse.jetty.toolchain.test.jupiter.WorkDirExtension;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
  * ClusteredSessionScavengingTest
  */
+//TODO
+@Disabled
 @ExtendWith(WorkDirExtension.class)
 public class ClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java
index 201bb01a56d..41db2e159fb 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanFileSessionDataStoreTest.java
@@ -35,7 +35,7 @@ public class InfinispanFileSessionDataStoreTest extends InfinispanSessionDataSto
     }
     
     @BeforeEach
-    public void setup() throws Exception
+    public void configure() throws Exception
     {
         _testSupport = new InfinispanTestSupport();
         _testSupport.setUseFileStore(true);
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java
index 34c56332ea3..d85783dc09a 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/InfinispanSessionDataStoreTest.java
@@ -54,7 +54,7 @@ public class InfinispanSessionDataStoreTest extends AbstractSessionDataStoreTest
     }
     
     @BeforeEach
-    public void setup() throws Exception
+    public void configure() throws Exception
     {
         _testSupport = new InfinispanTestSupport();
         _testSupport.setup(workDir.getEmptyPathDir());
@@ -119,14 +119,17 @@ public class InfinispanSessionDataStoreTest extends AbstractSessionDataStoreTest
     @Override
     public void testLoadSessionFails() throws Exception
     {
+        setUp();
+
         //create the SessionDataStore
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/test");
+        context.getSessionHandler().getSessionManager().setSessionIdManager(_sessionIdManager);
         context.setClassLoader(_contextClassLoader);
         SessionDataStoreFactory factory = createSessionDataStoreFactory();
         ((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
-        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
-        SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
+        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
+        SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
         store.initialize(sessionContext);
 
         //persist a session
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java
index 6cfd93414d4..f2ad5a84713 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/SerializedInfinispanSessionDataStoreTest.java
@@ -14,6 +14,7 @@
 package org.eclipse.jetty.session;
 
 import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
+import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.session.infinispan.EmbeddedQueryManager;
 import org.eclipse.jetty.session.infinispan.InfinispanSessionData;
 import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStore;
@@ -116,14 +117,16 @@ public class SerializedInfinispanSessionDataStoreTest extends AbstractSessionDat
     @Override
     public void testLoadSessionFails() throws Exception
     {
+        DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
         //create the SessionDataStore
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/test");
+        context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
         context.setClassLoader(_contextClassLoader);
         SessionDataStoreFactory factory = createSessionDataStoreFactory();
         ((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
-        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
-        SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
+        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
+        SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
         store.initialize(sessionContext);
 
         //persist a session
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java
index ffb6e4a76f2..fe4844f45f2 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredInvalidationSessionTest.java
@@ -13,17 +13,20 @@
 
 package org.eclipse.jetty.session.remote;
 
-import org.eclipse.jetty.session.AbstractClusteredInvalidationSessionTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredInvalidationSessionTest;
 import org.eclipse.jetty.session.LoggingUtil;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /**
  * InvalidationSessionTest
  */
+//TODO
+@Disabled
 @Testcontainers(disabledWithoutDocker = true)
 public class RemoteClusteredInvalidationSessionTest extends AbstractClusteredInvalidationSessionTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java
index 9c06f86afde..30d1b2d0512 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteClusteredSessionScavengingTest.java
@@ -13,17 +13,20 @@
 
 package org.eclipse.jetty.session.remote;
 
-import org.eclipse.jetty.session.AbstractClusteredSessionScavengingTest;
+import org.eclipse.jetty.ee9.session.AbstractClusteredSessionScavengingTest;
 import org.eclipse.jetty.session.LoggingUtil;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
 import org.eclipse.jetty.session.infinispan.InfinispanSessionDataStoreFactory;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 /**
  * ClusteredSessionScavengingTest
  */
+//TODO
+@Disabled
 @Testcontainers(disabledWithoutDocker = true)
 public class RemoteClusteredSessionScavengingTest extends AbstractClusteredSessionScavengingTest
 {
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java
index 4568d7741df..91fc061df97 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/src/test/java/org/eclipse/jetty/session/remote/RemoteInfinispanSessionDataStoreTest.java
@@ -14,8 +14,10 @@
 package org.eclipse.jetty.session.remote;
 
 import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
+import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.session.AbstractSessionDataStoreFactory;
 import org.eclipse.jetty.session.AbstractSessionDataStoreTest;
+import org.eclipse.jetty.session.DefaultSessionIdManager;
 import org.eclipse.jetty.session.LoggingUtil;
 import org.eclipse.jetty.session.SessionContext;
 import org.eclipse.jetty.session.SessionData;
@@ -65,7 +67,7 @@ public class RemoteInfinispanSessionDataStoreTest extends AbstractSessionDataSto
     }
 
     @BeforeEach
-    public void setup() throws Exception
+    public void configure() throws Exception
     {
         __testSupport.setup();
     }
@@ -150,13 +152,15 @@ public class RemoteInfinispanSessionDataStoreTest extends AbstractSessionDataSto
     @Override
     public void testLoadSessionFails() throws Exception
     {
+        DefaultSessionIdManager idMgr = new DefaultSessionIdManager(new Server());
         //create the SessionDataStore
         ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/test");
+        context.getSessionHandler().getSessionManager().setSessionIdManager(idMgr);
         SessionDataStoreFactory factory = createSessionDataStoreFactory();
         ((AbstractSessionDataStoreFactory)factory).setGracePeriodSec(GRACE_PERIOD_SEC);
-        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler());
-        SessionContext sessionContext = new SessionContext("foo", context.getServletContext());
+        SessionDataStore store = factory.getSessionDataStore(context.getSessionHandler().getSessionManager());
+        SessionContext sessionContext = new SessionContext(context.getSessionHandler().getSessionManager());
         store.initialize(sessionContext);
 
         //persist a session
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml
index f97414f3822..2d56cb4ca1b 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.eclipse.jetty.ee9</groupId>
     <artifactId>test-ee9-sessions</artifactId>
     <version>12.0.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>test-ee9-memcached-sessions</artifactId>
   <name>Jetty EE9 Tests :: Sessions :: Memcached</name>
@@ -40,7 +41,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.tests</groupId>
+      <groupId>org.eclipse.jetty.ee9</groupId>
       <artifactId>test-ee9-sessions-common</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java
index afc13da2b6c..d74bd9f1834 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/CachingSessionDataStoreTest.java
@@ -24,6 +24,7 @@ import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee9.session.SessionTestSupport;
 import org.eclipse.jetty.memcached.sessions.MemcachedTestHelper.MockDataStore;
 import org.eclipse.jetty.session.CachingSessionDataStore;
 import org.eclipse.jetty.session.DefaultSessionCacheFactory;
@@ -31,7 +32,6 @@ import org.eclipse.jetty.session.SessionData;
 import org.eclipse.jetty.session.SessionDataMap;
 import org.eclipse.jetty.session.SessionDataStore;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
-import org.eclipse.jetty.session.SessionTestSupport;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Testcontainers;
diff --git a/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java
index 3fcfe218464..dff4bac0367 100644
--- a/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java
+++ b/jetty-ee9/test-ee9-sessions/test-ee9-memcached-sessions/src/test/java/org/eclipse/jetty/memcached/sessions/MemcachedTestHelper.java
@@ -29,7 +29,7 @@ import org.eclipse.jetty.session.CachingSessionDataStoreFactory;
 import org.eclipse.jetty.session.SessionData;
 import org.eclipse.jetty.session.SessionDataStore;
 import org.eclipse.jetty.session.SessionDataStoreFactory;
-import org.eclipse.jetty.session.SessionHandler;
+import org.eclipse.jetty.session.SessionManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -136,7 +136,7 @@ public class MemcachedTestHelper
     {
 
         @Override
-        public SessionDataStore getSessionDataStore(SessionHandler handler) throws Exception
+        public SessionDataStore getSessionDataStore(SessionManager manager) throws Exception
         {
             return new MockDataStore();
         }