Try to avoid strange test errors when we aren't testing progress bars.

Try to avoid strange test errors when we aren't testing progress bars. #2520