diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 67922012a95e6ff1801fbc8567309dd80916cc5b..ac625474c50970d3ff4770db424b9685e33cfe7a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -5,9 +5,9 @@ test:
 	[ -f test1 ] || ln -s $(srcdir)/test* .
 
 EXTRA_DIST = \
-test1    test104  test13   test19   test21   test3    test5    \
-test10   test105  test14   test2    test22   test300  test6    \
-test100  test106  test15   test20   test23   test33   test7    \
-test101  test107  test16   test200  test24   test4    test8    \
-test102  test11   test17   test201  test25   test400  test9    \
-test103  test12   test18   test202  test26   test43   test44
+test1    test104  test11   test15   test20   test23   test33   test6 \
+test10   test105  test110  test16   test200  test24   test4    test7 \
+test100  test106  test111  test17   test201  test25   test400  test8 \
+test101  test107  test12   test18   test202  test26   test43   test9 \
+test102  test108  test13   test19   test21   test3    test44   \
+test103  test109  test14   test2    test22   test300  test5    
diff --git a/tests/data/test108 b/tests/data/test108
new file mode 100644
index 0000000000000000000000000000000000000000..5ae7c2a72e4b3fea8c868a9a0b380ddc23ef9bb5
--- /dev/null
+++ b/tests/data/test108
@@ -0,0 +1,39 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+ <name>
+FTP PORT upload with CWD
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/108 -T log/upload108 -P -
+</command>
+<file name="log/upload108">
+Moooooooooooo
+ upload this
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^PORT .*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD CWD/STOR/RETR
+PORT 127,0,0,1,5,109
+TYPE I
+STOR 108
+</protocol>
+<upload>
+Moooooooooooo
+ upload this
+</upload>
+</verify>
diff --git a/tests/data/test109 b/tests/data/test109
new file mode 100644
index 0000000000000000000000000000000000000000..18661885d59494fec2127fdd6b8fec57fe001003
--- /dev/null
+++ b/tests/data/test109
@@ -0,0 +1,37 @@
+# Server-side
+<reply>
+<data>
+</data>
+</reply>
+
+# Client-side
+<client>
+ <name>
+FTP PASV upload append
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/109 -T log/upload109 --append
+</command>
+<file name="log/upload109">
+Moooooooooooo
+ upload this
+</file>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+TYPE I
+APPE 109
+</protocol>
+<upload>
+Moooooooooooo
+ upload this
+</upload>
+</verify>
diff --git a/tests/data/test110 b/tests/data/test110
new file mode 100644
index 0000000000000000000000000000000000000000..ce0df48d3e501a9df547d63071032e267707072c
--- /dev/null
+++ b/tests/data/test110
@@ -0,0 +1,36 @@
+# Server-side
+<reply>
+<data>
+expected to be a file without the first part
+but we emulate that
+</data>
+<size>
+85
+</size>
+</reply>
+
+# Client-side
+<client>
+ <name>
+FTP download resume with set limit
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/110 -C 20
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+TYPE I
+SIZE 110
+REST 20
+RETR 110
+</protocol>
+</verify>
diff --git a/tests/data/test111 b/tests/data/test111
new file mode 100644
index 0000000000000000000000000000000000000000..6201f34940031e95fc91f0761fc7b63b9df4e2c4
--- /dev/null
+++ b/tests/data/test111
@@ -0,0 +1,33 @@
+# Server-side
+<reply>
+<size>
+85
+</size>
+</reply>
+
+# Client-side
+<client>
+ <name>
+FTP download resume beyond file size
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/111 -C 2000
+</command>
+</test>
+
+# Verify data after the test has been "shot"
+<verify>
+<errorcode>
+36
+</errorcode>
+<strip>
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+TYPE I
+SIZE 111
+</protocol>
+</verify>