fix bad dependency in test, the right way this time
Merge branch 'headless' into scala-2.11