Fix flaky acceptance test.
Merge pull request #3149 from edx/alex/fix_flaky_test

Fix flaky acceptance test.