Re #10532 changes to fix ISIS system tests