Fix the e2e test to remove a race.
Merge pull request #3040 from brendandburns/pd2

Fix the update e2e test to remove a race.