diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 205ca1c1fc..9a2500bace 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -38,4 +38,4 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test530 DISABLED test278 test279 test531 test280 test529 test532 test533 \
test534 test535 test281 test537 test282 test283 test284 test538 test285 \
test286 test307 test308 test287 test400 test288 test600 test601 test602 \
- test603 test401 test402 test290 test291
+ test603 test401 test402 test290 test291 test292 test293 test403
diff --git a/tests/data/test292 b/tests/data/test292
new file mode 100644
index 0000000000..0bdef6c0d0
--- /dev/null
+++ b/tests/data/test292
@@ -0,0 +1,56 @@
+
+
+
+HTTP
+HTTP GET
+--max-filesize
+
+
+
+#
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+
+
+
+#
+# Client-side
+
+
+http
+
+
+HTTP GET with maximum filesize not exceeded
+
+
+http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /292 HTTP/1.1
+Host: 127.0.0.1:%HTTPPORT
+Accept: */*
+
+
+
+
diff --git a/tests/data/test293 b/tests/data/test293
new file mode 100644
index 0000000000..5343d0cf59
--- /dev/null
+++ b/tests/data/test293
@@ -0,0 +1,60 @@
+
+
+
+HTTP
+HTTP GET
+--max-filesize
+FAILURE
+
+
+
+#
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+
+
+
+#
+# Client-side
+
+
+http
+
+
+HTTP GET with maximum filesize exceeded
+
+
+http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+63
+
+
+^User-Agent:.*
+
+
+GET /293 HTTP/1.1
+Host: 127.0.0.1:%HTTPPORT
+Accept: */*
+
+
+
+
diff --git a/tests/data/test403 b/tests/data/test403
new file mode 100644
index 0000000000..2b8ff5e29c
--- /dev/null
+++ b/tests/data/test403
@@ -0,0 +1,64 @@
+
+
+
+FTPS
+PASV
+LIST
+CCC
+FAILURE
+
+
+#
+# Server-side
+
+# When doing LIST, we get the default list output hard-coded in the test
+# FTPS server
+
+total 20
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 .
+drwxr-xr-x 8 98 98 512 Oct 22 13:06 ..
+drwxr-xr-x 2 98 98 512 May 2 1996 .NeXT
+-r--r--r-- 1 0 1 35 Jul 16 1996 README
+lrwxrwxrwx 1 0 1 7 Dec 9 1999 bin -> usr/bin
+dr-xr-xr-x 2 0 1 512 Oct 1 1997 dev
+drwxrwxrwx 2 98 98 512 May 29 16:04 download.html
+dr-xr-xr-x 2 0 1 512 Nov 30 1995 etc
+drwxrwxrwx 2 98 1 512 Oct 30 14:33 pub
+dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
+
+
+
+#
+# Client-side
+
+
+SSL
+
+
+ftps
+
+
+FTPS with CCC not supported by server
+
+
+-k --ftp-ssl-control --ftp-ssl-ccc ftps://%HOSTIP:%FTPSPORT/
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+USER anonymous
+PASS ftp@example.com
+PBSZ 0
+PROT C
+CCC
+PWD
+EPSV
+TYPE A
+LIST
+QUIT
+
+
+