Combined two tests to stop a spurious test failure when tests are
  run by nodetests. [bug=1212445]
3 files changed