diff --git a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStore.java b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStore.java
index 007f7c5e332..552f4a63cf4 100644
--- a/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStore.java
+++ b/tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/TestSessionDataStore.java
@@ -19,7 +19,6 @@
 
 package org.eclipse.jetty.server.session;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -102,8 +101,6 @@ public class TestSessionDataStore extends AbstractSessionDataStore
                 set.add(d.getId());
         }
         return set;
-        
-        //return Collections.emptySet();
     }
 
 }
diff --git a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/CreationTest.java b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/CreationTest.java
index 63e9213d011..4664be00432 100644
--- a/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/CreationTest.java
+++ b/tests/test-sessions/test-sessions-common/src/test/java/org/eclipse/jetty/server/session/CreationTest.java
@@ -265,7 +265,7 @@ public class CreationTest
             assertEquals(HttpServletResponse.SC_OK,response.getStatus());
   
             //ensure work has finished on the server side
-            _synchronizer.await();
+            _synchronizer.await(2*inactivePeriod, TimeUnit.SECONDS);
             
             //check that the sessions exist persisted
             assertTrue(contextHandler.getSessionHandler().getSessionCache().getSessionDataStore().exists(_servlet._id));
@@ -370,6 +370,8 @@ public class CreationTest
                 {
                     session = request.getSession(false);
                     assertNotNull(session);
+                    assertEquals(_id, session.getId());
+                    assertNotNull(session.getAttribute("value"));
                     assertNull(session.getAttribute("B")); //check we don't see stuff from other context
                     
                 }