Once WFCORE-4614 is done look for test deployments that are adding org.jboss.as.cli as a dependency and see if that can be removed. If that makes the test usable when run against a Galleon-slimmed installation (see WFLY-12394) then start testing it that way.

To find such tests:

git grep org.jboss.as.cli | grep Dependencies