Refs #8176 Fix for broken system tests