Merge "Fix ftw tests when run as non-root."