diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 502abecc5..e75949ffb 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -71,7 +71,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1203 test1117 test1118 test1119 test1120 test1300 test1301 test1302 \
  test1303 test320 test321 test322 test323 test324 test1121 test581 test580 \
  test1304 test1305 test1306 test1307 test582 test583 test808 test809       \
- test810 test811
+ test810 test811 test812 test813
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test812 b/tests/data/test812
new file mode 100644
index 000000000..eb2a83669
--- /dev/null
+++ b/tests/data/test812
@@ -0,0 +1,45 @@
+<testcase>
+<info>
+<keywords>
+POP3
+RETR
+FAILURE
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<servercmd>
+REPLY RETR -ERR no such message
+</servercmd>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+pop3
+</server>
+ <name>
+POP3 RETR invalid message
+ </name>
+ <command>
+pop3://%HOSTIP:%POP3PORT/812 -u user:secret
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+56
+</errorcode>
+<protocol>
+USER user
+PASS secret
+RETR 812
+QUIT
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test813 b/tests/data/test813
new file mode 100644
index 000000000..4953af413
--- /dev/null
+++ b/tests/data/test813
@@ -0,0 +1,43 @@
+<testcase>
+<info>
+<keywords>
+POP3
+FAILURE
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<servercmd>
+REPLY PASS -ERR invalid login
+</servercmd>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+pop3
+</server>
+ <name>
+POP3 invalid login
+ </name>
+ <command>
+pop3://%HOSTIP:%POP3PORT/813 -u user:wrong
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+67
+</errorcode>
+<protocol>
+USER user
+PASS wrong
+QUIT
+</protocol>
+</verify>
+</testcase>