16 files changed, 16 insertions, 17 deletions
diff --git a/src/testsuite/channel-test.e b/src/testsuite/channel-test.e
index f65c5196..5e0afab3 100644
--- a/src/testsuite/channel-test.e
+++ b/src/testsuite/channel-test.e
@@ -103,5 +103,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/check-idle.e b/src/testsuite/check-idle.e
index ad112b25..3c37e80b 100644
--- a/src/testsuite/check-idle.e
+++ b/src/testsuite/check-idle.e
@@ -25,7 +25,7 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
 
 exit $r
diff --git a/src/testsuite/connect-ssl-cert1-test.e b/src/testsuite/connect-ssl-cert1-test.e
index 5eb998b3..37abb762 100644
--- a/src/testsuite/connect-ssl-cert1-test.e
+++ b/src/testsuite/connect-ssl-cert1-test.e
@@ -17,5 +17,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/connect-ssl-cert2-test.e b/src/testsuite/connect-ssl-cert2-test.e
index cc10a1ed..0e67d75b 100644
--- a/src/testsuite/connect-ssl-cert2-test.e
+++ b/src/testsuite/connect-ssl-cert2-test.e
@@ -17,6 +17,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
-
diff --git a/src/testsuite/connect-test.e b/src/testsuite/connect-test.e
index b51be0db..f3015d8a 100644
--- a/src/testsuite/connect-test.e
+++ b/src/testsuite/connect-test.e
@@ -16,5 +16,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/invite-test.e b/src/testsuite/invite-test.e
index b9e0c3f9..f3115a3d 100644
--- a/src/testsuite/invite-test.e
+++ b/src/testsuite/invite-test.e
@@ -110,5 +110,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/join-test.e b/src/testsuite/join-test.e
index 643dde42..7e6a29a3 100644
--- a/src/testsuite/join-test.e
+++ b/src/testsuite/join-test.e
@@ -108,5 +108,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }
diff --git a/src/testsuite/kick-test.e b/src/testsuite/kick-test.e
index 89da611d..a8038796 100644
--- a/src/testsuite/kick-test.e
+++ b/src/testsuite/kick-test.e
@@ -109,5 +109,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }
diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e
index 9eb22e77..28d4a93f 100644
--- a/src/testsuite/message-test.e
+++ b/src/testsuite/message-test.e
@@ -148,5 +148,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/misc-test.e b/src/testsuite/misc-test.e
index f69e7c3c..8896624b 100644
--- a/src/testsuite/misc-test.e
+++ b/src/testsuite/misc-test.e
@@ -160,5 +160,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"ERROR"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/mode-test.e b/src/testsuite/mode-test.e
index 86e4f2df..668e57c6 100644
--- a/src/testsuite/mode-test.e
+++ b/src/testsuite/mode-test.e
@@ -171,5 +171,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/opless-channel-test.e b/src/testsuite/opless-channel-test.e
index 4611fe17..cd4f9a0b 100644
--- a/src/testsuite/opless-channel-test.e
+++ b/src/testsuite/opless-channel-test.e
@@ -29,5 +29,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }
diff --git a/src/testsuite/server-link-test.e b/src/testsuite/server-link-test.e
index 910f8c84..48230afe 100644
--- a/src/testsuite/server-link-test.e
+++ b/src/testsuite/server-link-test.e
@@ -46,5 +46,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"ERROR"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/stress-B.e b/src/testsuite/stress-B.e
index 95156cbb..53c75a04 100644
--- a/src/testsuite/stress-B.e
+++ b/src/testsuite/stress-B.e
@@ -72,5 +72,5 @@ sleep 1
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/who-test.e b/src/testsuite/who-test.e
index 39e3a2f1..55c65702 100644
--- a/src/testsuite/who-test.e
+++ b/src/testsuite/who-test.e
@@ -199,5 +199,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"Connection closed"
+	"ERROR :Closing connection"
 }
diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e
index 44eee668..74442ed4 100644
--- a/src/testsuite/whois-test.e
+++ b/src/testsuite/whois-test.e
@@ -73,5 +73,5 @@ expect {
 send "quit\r"
 expect {
 	timeout { exit 1 }
-	"ERROR"
+	"ERROR :Closing connection"
 }