NullPointerException on DefaultSessionService.getOrBindSession(DefaultSessionService.java:189)

We have hybris 5.6 running upgraded from 4.x; We never had junit tenant running after upgrade. Recently we want to bring back integration tests so we active the junit test. But we are experience NullpointerException on some aspects as shown below.. We debug and found that when it getCurrentSession in JaloSession, the Registry.getCurrentTenant() will return this "junit" tenant as the active tenant and then jalosession will be null and exception occured.

I am wondering if there is any way to solve this?

java.lang.NullPointerException at de.hybris.platform.servicelayer.session.impl.DefaultSessionService.getOrBindSession(DefaultSessionService.java:189) at de.hybris.platform.servicelayer.session.impl.DefaultSessionService.getCurrentSession(DefaultSessionService.java:55) at de.hybris.platform.servicelayer.session.impl.DefaultSessionService.getAttribute(DefaultSessionService.java:152) at de.hybris.platform.servicelayer.session.impl.DefaultSessionService.getOrLoadAttribute(DefaultSessionService.java:160) at de.hybris.platform.order.impl.DefaultCartService.internalGetSessionCart(DefaultCartService.java:136) at de.hybris.platform.order.impl.DefaultCartService.getSessionCart(DefaultCartService.java:120) at com.xxx.order.services.impl.GxxxB2BCartService.getRequestCart(GxxxB2BCartService.java:686) at com.xxx.order.services.impl.GxxxB2BCartService.getRequestCart(GxxxB2BCartService.java:621) at com.xxx.oms.aspects.PendingOrderUpdatesAspect.afterSave(PendingOrderUpdatesAspect.java:805) at com.xxx.address.facades.impl.GxxxAddressFacade.save(GxxxAddressFacade.java:288) at com.xxx.address.facades.impl.GxxxAddressFacade.save(GxxxAddressFacade.java:279)