Refs #7965 Fix broken system tests on develop