This no longer explodes if running only one smoke test
Merge pull request #600 from seandst/no-nextitem-explodes

This no longer explodes if running only one smoke test