am 460dd85f: Merge "Fix test-art setup."

* commit '460dd85f3f08f5de2f4ec2b5013a5892f789d619':
  Fix test-art setup.