diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java b/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java
index 9ded6ce90..11bed79a9 100644
--- a/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java
+++ b/router/java/test/junit/net/i2p/router/client/LocalClientConnectionRunner.java
@@ -42,9 +42,9 @@ class LocalClientConnectionRunner extends ClientConnectionRunner {
      *  don't instantiate a RequestLeaseSetJob
      */
     @Override
-    void requestLeaseSet(LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) {
+    void requestLeaseSet(Hash h, LeaseSet set, long expirationTime, Job onCreateJob, Job onFailedJob) {
         RequestVariableLeaseSetMessage msg = new RequestVariableLeaseSetMessage();
-        msg.setSessionId(getSessionId());
+        msg.setSessionId(getSessionId(h));
         for (int i = 0; i < set.getLeaseCount(); i++) {
             Lease lease = set.getLease(i);
             msg.addEndpoint(lease);
@@ -60,12 +60,12 @@ class LocalClientConnectionRunner extends ClientConnectionRunner {
      *  No job queue, so super NPEs
      */
     @Override
-    void updateMessageDeliveryStatus(MessageId id, long messageNonce, int status) {
+    void updateMessageDeliveryStatus(Destination dest, MessageId id, long messageNonce, int status) {
         if (messageNonce <= 0)
             return;
         MessageStatusMessage msg = new MessageStatusMessage();
         msg.setMessageId(id.getMessageId());
-        msg.setSessionId(getSessionId().getSessionId());
+        msg.setSessionId(getSessionId(dest.calculateHash()).getSessionId());
         // has to be >= 0, it is initialized to -1
         msg.setNonce(messageNonce);
         msg.setSize(0);
diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
index 12666969d..0f9ba30ab 100644
--- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
+++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
@@ -58,12 +58,12 @@ class LocalClientManager extends ClientManager {
         if (runner != null) {
             runner.receiveMessage(toDest, fromDest, payload);
             if (sender != null)
-                sender.updateMessageDeliveryStatus(msgId, messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL);
+                sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, MessageStatusMessage.STATUS_SEND_SUCCESS_LOCAL);
         } else {
             // remote.  ignore.
             System.out.println("Message " + msgId + " is targeting a REMOTE destination - DROPPED");
             if (sender != null)
-                sender.updateMessageDeliveryStatus(msgId, messageNonce, MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE);
+                sender.updateMessageDeliveryStatus(fromDest, msgId, messageNonce, MessageStatusMessage.STATUS_SEND_GUARANTEED_FAILURE);
         }
     }
 
diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java b/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java
index 17cd20e71..d4873f4a8 100644
--- a/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java
+++ b/router/java/test/junit/net/i2p/router/client/LocalClientMessageEventListener.java
@@ -25,6 +25,7 @@ import net.i2p.data.i2cp.GetBandwidthLimitsMessage;
 import net.i2p.data.i2cp.HostLookupMessage;
 import net.i2p.data.i2cp.HostReplyMessage;
 import net.i2p.data.i2cp.I2CPMessageException;
+import net.i2p.data.i2cp.SessionConfig;
 import net.i2p.data.i2cp.SessionId;
 import net.i2p.router.RouterContext;
 
@@ -43,7 +44,7 @@ class LocalClientMessageEventListener extends ClientMessageEventListener {
      *  Immediately send a fake leaseset
      */
     @Override
-    protected void startCreateSessionJob() {
+    protected void startCreateSessionJob(SessionConfig config) {
         long exp = _context.clock().now() + 10*60*1000;
         LeaseSet ls = new LeaseSet();
         Lease lease = new Lease();
@@ -53,7 +54,7 @@ class LocalClientMessageEventListener extends ClientMessageEventListener {
         Date date = new Date(exp);
         lease.setEndDate(date);
         ls.addLease(lease);
-        _runner.requestLeaseSet(ls, exp, null, null);
+        _runner.requestLeaseSet(config.getDestination().calculateHash(), ls, exp, null, null);
     }
 
     /**