diff --git a/Makefile b/Makefile
index 1b517b612..3aefd0b37 100644
--- a/Makefile
+++ b/Makefile
@@ -376,7 +376,7 @@ $(TEST_TARGETS):
 
 
 # extract some data about the testing setup: kernel, network connectivity, user
-lab-setup:; uname -r; pwd; whoami; cat /etc/resolv.conf; cat /etc/hosts
+lab-setup:; uname -r; pwd; whoami; cat /etc/resolv.conf; cat /etc/hosts; ls /etc
 
 test: lab-setup test-profiles test-fcopy test-fnetfilter test-fs test-utils test-sysutils test-environment test-apps test-apps-x11 test-apps-x11-xorg test-filters
 	echo "TEST COMPLETE"
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index bab243c4b..a1aaa80a7 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -127,3 +127,11 @@ else
 	echo "TESTING SKIP: strings not found"
 fi
 
+if command -v whois
+then
+	echo "TESTING: whois"
+	./whois.exp
+else
+	echo "TESTING SKIP: whois not found"
+fi
+
diff --git a/test/private-lib/whois.exp b/test/sysutils/whois.exp
similarity index 100%
rename from test/private-lib/whois.exp
rename to test/sysutils/whois.exp