diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 37edc3e4229f6d9a3ff471f7ec83408e62f2746e..cdb7f8c8857ad8972ed056cebf05e9cc8baaa89a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -13,4 +13,6 @@ test102 test11 test117 test124 test19 test23 test33 test8 \
test103 test110 test118 test125 test2 test24 test4 test9 \
test104 test111 test119 test13 test20 test25 test400 test47 \
test105 test112 test12 test14 test200 test26 test43 test46 \
-test34 test36 test37 test27 test28
+test34 test36 test37 test27 test28 test29 test303 test126 test400 \
+test401
+
diff --git a/tests/data/test126 b/tests/data/test126
new file mode 100644
index 0000000000000000000000000000000000000000..8b83521f893036ab291110d96f6d42e77385613a
--- /dev/null
+++ b/tests/data/test126
@@ -0,0 +1,30 @@
+# Server-side
+
+moooooooo
+
+
+# Client-side
+
+
+FTP download with strict timeout and slow CWD
+
+
+ftp://%HOSTIP:%FTPPORT/path/to/file/126 -m 3
+
+
+DELAY CWD 15
+
+
+
+# Verify data after the test has been "shot"
+
+
+28
+
+
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path/to/file
+
+
diff --git a/tests/data/test29 b/tests/data/test29
new file mode 100644
index 0000000000000000000000000000000000000000..66ff5b9fca33056ffd40b1e206c4894d1c653585
--- /dev/null
+++ b/tests/data/test29
@@ -0,0 +1,40 @@
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+result
+
+
+wait 10
+
+
+
+# Client-side
+
+
+HTTP with 2 secs timeout
+
+
+http://%HOSTIP:%HOSTPORT/want/29 -m 2
+
+
+
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /want/29 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+
+
+28
+
+
diff --git a/tests/data/test303 b/tests/data/test303
new file mode 100644
index 0000000000000000000000000000000000000000..1b2253d41097a1d7cd93d27cab22212509ae429a
--- /dev/null
+++ b/tests/data/test303
@@ -0,0 +1,40 @@
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+result
+
+
+wait 10
+
+
+
+# Client-side
+
+
+HTTPS with 2 secs timeout
+
+
+http://%HOSTIP:%HOSTPORT/want/303 -m 2
+
+
+
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /want/303 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
+
+
+
+28
+
+
diff --git a/tests/data/test401 b/tests/data/test401
new file mode 100644
index 0000000000000000000000000000000000000000..8719ca8ca883feb39c5702b10102bd299faea2b6
--- /dev/null
+++ b/tests/data/test401
@@ -0,0 +1,30 @@
+# Server-side
+
+moooooooo
+
+
+# Client-side
+
+
+FTPS download with strict timeout and slow CWD
+
+
+ftps://%HOSTIP:%FTPSPORT/path/to/file/401 -m 4
+
+
+DELAY CWD 15
+
+
+
+# Verify data after the test has been "shot"
+
+
+28
+
+
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path/to/file
+
+
diff --git a/tests/data/test402 b/tests/data/test402
new file mode 100644
index 0000000000000000000000000000000000000000..27b265c34cd3a2aeca786cf0bc4caf35582fce05
--- /dev/null
+++ b/tests/data/test402
@@ -0,0 +1,21 @@
+# Server-side
+
+moooooooo
+
+
+# Client-side
+
+
+FTPS operation to FTP port
+
+
+ftps://%HOSTIP:%FTPPORT/path/to/file/402
+
+
+
+# Verify data after the test has been "shot"
+
+
+35
+
+