Fix test enshrining bug 704384.
Merge pull request #567 from kmaglione/bug-704384-fallout

Fix test enshrining bug 704384.