diff --git a/CHANGES b/CHANGES
index b0063a76b1592cef9f244233412bc8f30899b995..f205cdd32836220a7ad0d6dff05660223cc10234 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Fandrich (9 Jul 2008)
+- Added tests 1036 and 1037 to verify resumed ftp downloads with -C -
+
 Daniel Stenberg (9 Jul 2008)
 - Andreas Schuldei improved Phil Blundell's patch for IPv6 using c-ares, and I
   edited it slightly. Now you should be able to use IPv6 addresses fine even
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 4ad314f5e103ba2805bb80a0127aafada7599dc0..d8375a4622645c23695153f4374053167306c796 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -52,7 +52,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test620 test621 test622 test623 test624 test625 test626 test627 test554   \
  test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030    \
  test556 test1031 test628 test629 test630 test631 test632 test1032 test1033 \
- test539 test1034 test1035
+ test539 test1034 test1035 test1036 test1037
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1036 b/tests/data/test1036
new file mode 100644
index 0000000000000000000000000000000000000000..471a1157851ccadb5dc0659b544a8da5791e11a1
--- /dev/null
+++ b/tests/data/test1036
@@ -0,0 +1,61 @@
+<testcase>
+<info>
+<keywords>
+FTP
+PASV
+RETR
+Resume
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data nocheck="1">
+expected to be a file without the first part
+but we emulate that
+</data>
+<size>
+85
+</size>
+<servercmd>
+REPLY EPSV 500 no such command
+</servercmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download resume from end of file
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/1036 -C -
+</command>
+<file name="log/curl1036.out">
+This is the start!!
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 1036
+REST 20
+RETR 1036
+QUIT
+</protocol>
+<file name="log/curl1036.out">
+This is the start!!
+expected to be a file without the first part
+but we emulate that
+</file>
+</verify>
+</testcase>
diff --git a/tests/data/test1037 b/tests/data/test1037
new file mode 100644
index 0000000000000000000000000000000000000000..e4a705dfb94ff64ca1e726d7a52045dc6d7b5692
--- /dev/null
+++ b/tests/data/test1037
@@ -0,0 +1,54 @@
+<testcase>
+<info>
+<keywords>
+FTP
+PASV
+RETR
+Resume
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data nocheck="1">
+expected to be a file without the first part
+but we emulate that
+</data>
+<size>
+65
+</size>
+<servercmd>
+REPLY EPSV 500 no such command
+</servercmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP download resume from end of empty file
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/1037 -C -
+</command>
+<file name="log/curl1037.out">
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+PASV
+TYPE I
+SIZE 1037
+RETR 1037
+QUIT
+</protocol>
+</verify>
+</testcase>