diff --git a/tests/data/test800 b/tests/data/test800
index ccbc632dca..6b29f7a2ba 100644
--- a/tests/data/test800
+++ b/tests/data/test800
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 FETCH
 </keywords>
 </info>
diff --git a/tests/data/test801 b/tests/data/test801
index af7e387665..0012d3e4d2 100644
--- a/tests/data/test801
+++ b/tests/data/test801
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 FETCH
 </keywords>
 </info>
diff --git a/tests/data/test802 b/tests/data/test802
index 3bb7165402..17349a89a8 100644
--- a/tests/data/test802
+++ b/tests/data/test802
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 SELECT
 UIDVALIDITY
 </keywords>
diff --git a/tests/data/test803 b/tests/data/test803
index 220c84500e..5b8cc9eb64 100644
--- a/tests/data/test803
+++ b/tests/data/test803
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 SELECT
 UIDVALIDITY
 FAILURE
diff --git a/tests/data/test804 b/tests/data/test804
index 7e13bb12b2..c6dfccf4a9 100644
--- a/tests/data/test804
+++ b/tests/data/test804
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 SELECT
 </keywords>
 </info>
diff --git a/tests/data/test805 b/tests/data/test805
index 3c20ff4606..e70c1a667b 100644
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 APPEND
 UPLOAD
 </keywords>
diff --git a/tests/data/test806 b/tests/data/test806
index fafcdcce75..37822a47f3 100644
--- a/tests/data/test806
+++ b/tests/data/test806
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 LIST
 </keywords>
 </info>
diff --git a/tests/data/test807 b/tests/data/test807
index 20e96d114e..9f9a8fa20f 100644
--- a/tests/data/test807
+++ b/tests/data/test807
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 LSUB
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test808 b/tests/data/test808
index 60d0ba74ff..30c8bdfd22 100644
--- a/tests/data/test808
+++ b/tests/data/test808
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 EXAMINE
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test809 b/tests/data/test809
index 1ef631322c..4283179d74 100644
--- a/tests/data/test809
+++ b/tests/data/test809
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 STATUS
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test810 b/tests/data/test810
index ab5e6e10fb..62e179d21a 100644
--- a/tests/data/test810
+++ b/tests/data/test810
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 SEARCH
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test811 b/tests/data/test811
index 8a4d06bc28..8fb3aa7a72 100644
--- a/tests/data/test811
+++ b/tests/data/test811
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 CREATE
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test812 b/tests/data/test812
index a4b8db5f87..6d1b42df96 100644
--- a/tests/data/test812
+++ b/tests/data/test812
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 DELETE
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test813 b/tests/data/test813
index 06514c2c42..3544da6707 100644
--- a/tests/data/test813
+++ b/tests/data/test813
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 RENAME
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test814 b/tests/data/test814
index 8d653aba4b..0b90e5bcb0 100644
--- a/tests/data/test814
+++ b/tests/data/test814
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 CHECK
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test815 b/tests/data/test815
index 5c5ef7987f..f955478256 100644
--- a/tests/data/test815
+++ b/tests/data/test815
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 STORE
 CLOSE
 CUSTOMREQUEST
diff --git a/tests/data/test816 b/tests/data/test816
index b8b1a9de25..72fad9f484 100644
--- a/tests/data/test816
+++ b/tests/data/test816
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 STORE
 EXPUNGE
 CUSTOMREQUEST
diff --git a/tests/data/test817 b/tests/data/test817
index 9079f28b8b..9b44ae9b18 100644
--- a/tests/data/test817
+++ b/tests/data/test817
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 COPY
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test818 b/tests/data/test818
index 403313b15e..95282c4e36 100644
--- a/tests/data/test818
+++ b/tests/data/test818
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 IMAP
+Clear Text
 NOOP
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test850 b/tests/data/test850
index e76d7b791d..6176101578 100644
--- a/tests/data/test850
+++ b/tests/data/test850
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 RETR
 </keywords>
 </info>
diff --git a/tests/data/test851 b/tests/data/test851
index 5ebb3a0945..60c49c47f9 100644
--- a/tests/data/test851
+++ b/tests/data/test851
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 LIST
 </keywords>
 </info>
diff --git a/tests/data/test852 b/tests/data/test852
index e07c172bcb..de9fbe2f07 100644
--- a/tests/data/test852
+++ b/tests/data/test852
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 LIST
 FAILURE
 </keywords>
diff --git a/tests/data/test853 b/tests/data/test853
index 3d2a6712a4..a3b9688094 100644
--- a/tests/data/test853
+++ b/tests/data/test853
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 LIST
 </keywords>
 </info>
diff --git a/tests/data/test854 b/tests/data/test854
index 074969a4fa..a8a18b6895 100644
--- a/tests/data/test854
+++ b/tests/data/test854
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 LIST
 </keywords>
 </info>
diff --git a/tests/data/test855 b/tests/data/test855
index bcbdf48162..87fe744fd7 100644
--- a/tests/data/test855
+++ b/tests/data/test855
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 RETR
 FAILURE
 </keywords>
diff --git a/tests/data/test856 b/tests/data/test856
index 0c75045c42..4d8d7ed61e 100644
--- a/tests/data/test856
+++ b/tests/data/test856
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 POP3
-LOGIN
+Clear Text
 FAILURE
 </keywords>
 </info>
diff --git a/tests/data/test857 b/tests/data/test857
index 8c57adc83e..055e35cf8d 100644
--- a/tests/data/test857
+++ b/tests/data/test857
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 RETR
 </keywords>
 </info>
diff --git a/tests/data/test858 b/tests/data/test858
index 0c7b3b7482..926dcd9e9e 100644
--- a/tests/data/test858
+++ b/tests/data/test858
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 DELE
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test859 b/tests/data/test859
index b85ba1f901..3d2e1c766b 100644
--- a/tests/data/test859
+++ b/tests/data/test859
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 STAT
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test860 b/tests/data/test860
index 46a1b9a727..26809bf346 100644
--- a/tests/data/test860
+++ b/tests/data/test860
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 NOOP
 CUSTOMREQUEST
 </keywords>
diff --git a/tests/data/test861 b/tests/data/test861
index ee86d82c26..4cc3987421 100644
--- a/tests/data/test861
+++ b/tests/data/test861
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 UIDL
 CUSTOMREQUEST
 RFC2449
diff --git a/tests/data/test862 b/tests/data/test862
index 140a064b5a..a21b514407 100644
--- a/tests/data/test862
+++ b/tests/data/test862
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 TOP
 CUSTOMREQUEST
 RFC2449
diff --git a/tests/data/test863 b/tests/data/test863
index a7c74bc57e..11c92e97ba 100644
--- a/tests/data/test863
+++ b/tests/data/test863
@@ -2,6 +2,7 @@
 <info>
 <keywords>
 POP3
+Clear Text
 RSET
 CUSTOMREQUEST
 </keywords>