move additional command usage in top-level

This avoid messing with tests on Solaris.

see: #2346