There are intermittent failures in TestGadgetTokenInfoService caused if AbstractTokenService.cleanExpiredTokens (runs every 600ms) runs concurrently with one of the tests. It looks like neither GadgetTokenInfoService or AbstractTokenService are thread safe, is this correct? There are also more classes implementing AbstractTokenService that could have the same problem. On the surface it looks like it may not cause real problems though, can someone confirm this? I've added a temporary concurrency test to https://github.com/stianst/gatein-portal/blob/GTNPORTAL-2673-TMP_CONCURRE... The JIRA issue for the test failures is https://issues.jboss.org/browse/GTNPORTAL-2673 Cheers, Stian