pacify tests

Change-Id: I9079c3bd61076a4c805f5d284c11aaa4f1653080