Re #6366 update system tests