diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index dfb238345d..10d72fd7c1 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -92,7 +92,7 @@ test573 test574 test575 test576 test577 test578 test579 test580 test581 \
 test582 test583 test584 test585 test586 test587 test588 test589 test590 \
 test591 test592 test593 test594 test595 test596 test597 test598 test599 \
 test600 test601 test602 test603 test604 test605 test606 test607 test608 \
-test609 test610         test612 test613 test614 test615 test616 test617 \
+test609 test610 test611 test612 test613 test614 test615 test616 test617 \
 test618 test619 test620 test621 test622 test623 test624 test625 test626 \
 test627 test628 test629 test630 test631 test632 test633 test634 test635 \
 test636 test637 test638 test639 test640 test641 test642 test643 test644 \
@@ -139,7 +139,7 @@ test997 test998 test999 test1000 test1001 test1002 test1003 test1004    \
 test1005 test1006 test1007 test1008 test1009 test1010 test1011 test1012 \
 test1013 test1014 test1015 test1016 test1017 test1018 test1019 test1020 \
 test1021 test1022 test1023 test1024 test1025 test1026 test1027 test1028 \
-test1029          test1031 test1032 test1033 test1034 test1035 test1036 \
+test1029 test1030 test1031 test1032 test1033 test1034 test1035 test1036 \
 test1037 test1038 test1039 test1040 test1041 test1042 test1043 test1044 \
 test1045 test1046 test1047 test1048 test1049 test1050 test1051 test1052 \
 test1053 test1054 test1055 test1056 test1057 test1058 test1059 test1060 \
diff --git a/tests/data/test1030 b/tests/data/test1030
new file mode 100644
index 0000000000..cb35a0f085
--- /dev/null
+++ b/tests/data/test1030
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP PUT
+HTTP Digest auth
+--anyauth
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data crlf="headers">
+HTTP/1.1 401 Authorization Required
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+Content-Length: 26
+Content-Type: text/html; charset=iso-8859-1
+
+This is not the real page
+</data>
+
+# This is supposed to be returned when the server gets a
+# Authorization: Digest line passed-in from the client
+<data1000 crlf="headers">
+HTTP/1.1 200 OK
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 23
+Connection: close
+
+This IS the real page!
+</data1000>
+
+<datacheck crlf="headers">
+HTTP/1.1 401 Authorization Required
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+Content-Length: 26
+Content-Type: text/html; charset=iso-8859-1
+
+HTTP/1.1 200 OK
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 23
+Connection: close
+
+This IS the real page!
+</datacheck>
+
+</reply>
+
+# Client-side
+<client>
+<server>
+http
+</server>
+<features>
+!SSPI
+crypto
+digest
+</features>
+<name>
+HTTP PUT with --anyauth, picking Digest. Persistent connection.
+</name>
+<command>
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
+</command>
+<file name="%LOGDIR/put%TESTNUMBER">
+This is data we upload with PUT
+a second line
+line three
+four is the number of lines
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol crlf="headers">
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
+This is data we upload with PUT
+a second line
+line three
+four is the number of lines
+PUT /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="01cb59db1ddaac246b072d5f5f0716d9"
+User-Agent: curl/%VERSION
+Accept: */*
+Content-Length: 85
+
+This is data we upload with PUT
+a second line
+line three
+four is the number of lines
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test608 b/tests/data/test608
index 5ac7a67d96..9e35595e76 100644
--- a/tests/data/test608
+++ b/tests/data/test608
@@ -20,7 +20,7 @@ Test file for rename test
 sftp
 </server>
 <name>
-SFTP post-quote rename
+SFTP post-quote rename a file
 </name>
 <command>
 --key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %SFTP_PWD/%LOGDIR/file%TESTNUMBER.txt %SFTP_PWD/%LOGDIR/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SFTP_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
diff --git a/tests/data/test611 b/tests/data/test611
new file mode 100644
index 0000000000..3de6009e52
--- /dev/null
+++ b/tests/data/test611
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<testcase>
+<info>
+<keywords>
+SFTP
+post-quote
+</keywords>
+</info>
+
+# Server-side
+<reply>
+<data>
+Dummy test file for rename test
+</data>
+</reply>
+
+# Client-side
+<client>
+<server>
+sftp
+</server>
+<precheck>
+%PERL %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
+</precheck>
+<name>
+SFTP post-quote rename a directory
+</name>
+<command>
+--key %LOGDIR/server/curl_client_key --pubkey %LOGDIR/server/curl_client_key.pub -u %USER: -Q "-rename %SFTP_PWD/%LOGDIR/test%TESTNUMBER.dir %SFTP_PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SFTP_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure
+</command>
+<file name="%LOGDIR/file%TESTNUMBER.txt">
+Dummy test file for rename test
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<postcheck>
+%PERL %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
+</postcheck>
+</verify>
+</testcase>