I've actually issued another PR that does just that, for these tests and a few others: https://github.com/infinispan/infinispan/pull/2399