diff --git a/.travis.yml b/.travis.yml
index 9d1433f6..a3cc99a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,11 +25,8 @@ before_install:
   
 install:
   - sudo tests/system-setup/remote-nextcloud-docker.sh
-  - hostname -I || true
-  - hostname -i || true
   - hostname || true
   - hostname --fqdn || true
-  - nslookup box.abc.com || true
   - getent hosts box.abc.com || true
 
 script:
diff --git a/tests/suites/_mail-functions.sh b/tests/suites/_mail-functions.sh
index a9a64bca..e319a188 100644
--- a/tests/suites/_mail-functions.sh
+++ b/tests/suites/_mail-functions.sh
@@ -10,14 +10,14 @@ ensure_root_user() {
 	# ensure there is a local email account for root.
 	#
 	# on exit, ROOT, ROOT_MAILDROP, and ROOT_DN are set, and if no
-	# account exists, a new root@$(hostname) is created having a
+	# account exists, a new root@$(hostname --fqdn) is created having a
 	# random password
 	#
 	if [ ! -z "$ROOT_MAILDROP" ]; then
 		# already have it
 		return
 	fi
-	ROOT="${USER}@$(hostname)"
+	ROOT="${USER}@$(hostname --fqdn || hostname)"
 	record "[Find user $ROOT]"
 	get_attribute "$LDAP_USERS_BASE" "mail=$ROOT" "maildrop"
 	ROOT_MAILDROP="$ATTR_VALUE"
diff --git a/tests/suites/mail-access.sh b/tests/suites/mail-access.sh
index 31816711..7107e330 100644
--- a/tests/suites/mail-access.sh
+++ b/tests/suites/mail-access.sh
@@ -189,7 +189,7 @@ EOF
 }
 
 
-suite_start "mail-access"
+suite_start "mail-access" ensure_root_user
 
 test_greylisting
 test_relay_prohibited
diff --git a/tests/suites/mail-basic.sh b/tests/suites/mail-basic.sh
index 8994e268..43e551be 100644
--- a/tests/suites/mail-basic.sh
+++ b/tests/suites/mail-basic.sh
@@ -67,7 +67,7 @@ test_self_send_receive() {
 
 
 
-suite_start "mail-basic"
+suite_start "mail-basic" ensure_root_user
 
 test_trial_send_local
 test_trial_send_remote
diff --git a/tests/system-setup/remote-nextcloud-docker.sh b/tests/system-setup/remote-nextcloud-docker.sh
index 03ce27ff..2086eef6 100755
--- a/tests/system-setup/remote-nextcloud-docker.sh
+++ b/tests/system-setup/remote-nextcloud-docker.sh
@@ -79,8 +79,9 @@ before_miab_install() {
     fi
     
     # install prerequisites
-    H2 "QA prerequisites"
-    install_qa_prerequisites || die "Error installing QA prerequisites"
+    H2 "QA pre-setup prerequisites"
+    install_pre_setup_qa_prerequisites \
+        || die "Error installing QA prerequisites"
 
     # enable the remote Nextcloud setup mod, which tells MiaB-LDAP to use
     # the remote Nextcloud for calendar and contacts instead of the
@@ -197,9 +198,6 @@ after_miab_install() {
            "$PRIMARY_HOSTNAME" \
            "$LDAP_NEXTCLOUD_PASSWORD" \
         || die "docker: error running remote-nextcloud-use-miab.sh"
-
-    # re-add systemd name resolver as a secondary nameserver
-    echo "nameserver 127.0.0.53" >> /etc/resolv.conf
 }
 
 
diff --git a/tests/system-setup/setup-funcs.sh b/tests/system-setup/setup-funcs.sh
index f28c4ef1..9f8194d5 100755
--- a/tests/system-setup/setup-funcs.sh
+++ b/tests/system-setup/setup-funcs.sh
@@ -186,7 +186,7 @@ install_docker() {
 }
 
 
-install_qa_prerequisites() {
+install_pre_setup_qa_prerequisites() {
     [ -z "$STORAGE_ROOT" ] \
         && echo "Error: STORAGE_ROOT not set" 1>&2 \
         && return 1