Maybe I can split the issue into two separate issues, so the first one will include the arquillian extension CleanUnmanagedContainersOnAfterClassExtension only. Do you agree?