Bug 993013 - Fix 'this._cps2 is undefined' errors in test runs r=adw