Experimental attempt to fix TC-only test failure