-user="`id -un`"
-host="`hostname`"
-
-run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}" \
- 1 "Basic user test"
-run_test "${MH_LIB_DIR}/ap -format %(mymbox{text}) ${user}@${host}" \
- 1 "Basic user@host test"
+#### Use ap to get the username. That will either be what's in the
+#### Local-Mailbox profile component, which we don't use in the test
+#### suite, or the user's login name. ap will escape (quote) it if
+#### needed.
+user=`${MH_LIB_DIR}/ap -format '%(me)' 0`
+host=`${MH_OBJ_DIR}/test/getfqdn`
+
+output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}"`
+run_test "echo $output" 1 "Basic user test"
+output=`${MH_LIB_DIR}/ap -format '%(mymbox{text})' "${user}@${host}"`
+run_test "echo $output" 1 "Basic user@host test"