diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e
index 2aed6944..3c393e8d 100644
--- a/src/testsuite/whois-test.e
+++ b/src/testsuite/whois-test.e
@@ -19,6 +19,10 @@ expect {
 	timeout { exit 1 }
 	"311 nick nick ~user localhost* \* :Real Name\r"
 }
+expect {
+	timeout { exit 1 }
+	"318 nick nick :"
+}
 
 send "whois *\r"
 expect {
@@ -44,6 +48,16 @@ expect {
 	"311 nick nick ~user localhost* \* :Real Name\r"
 }
 
+send "whois unknown\r"
+expect {
+	timeout { exit 1 }
+	"401 nick unknown :"
+}
+expect {
+	timeout { exit 1 }
+	"318 nick unknown :"
+}
+
 send "quit\r"
 expect {
 	timeout { exit 1 }