[MODCLUSTER-405] Make the testsuite a little more portable