Attempt to fix LockingTest in 2.6 and 3.3.