Switch to testr for keystone/master