diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index f5d3039f99bfd89fd38c6e344e53f7fcf6b29334..8924a394aa4b153d236386a067077bd207b72a34 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -37,4 +37,5 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test274 test275 test524 test525 test276 test277 test526 test527 test528   \
  test530 DISABLED test278 test279 test531 test280 test529 test532 test533  \
  test534 test535 test281 test537 test282 test283 test284 test538 test285   \
- test286 test307 test308 test287 test400 test288
+ test286 test307 test308 test287 test400 test288 test600 test601 test602   \
+ test603
diff --git a/tests/data/test600 b/tests/data/test600
index 5b56c748e2a14b676ac4cba23a2807029730e3c9..46f960a9c88a7f5b33ee8def081fb5be1457d67b 100644
--- a/tests/data/test600
+++ b/tests/data/test600
@@ -8,7 +8,7 @@ SFTP
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 Test data
 for ssh test
 </data>
diff --git a/tests/data/test601 b/tests/data/test601
index bd394608a00ab81c6a39262abbc56186be6582b1..e6f846d090c6ba900642bf9bc7bc2392a6e97559 100644
--- a/tests/data/test601
+++ b/tests/data/test601
@@ -8,7 +8,7 @@ SCP
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 Test data
 for ssh test
 </data>
diff --git a/tests/data/test602 b/tests/data/test602
new file mode 100644
index 0000000000000000000000000000000000000000..327e957539ff37b7a0a3e44248b7cde3e3b4078e
--- /dev/null
+++ b/tests/data/test602
@@ -0,0 +1,43 @@
+<testcase>
+<info>
+<keywords>
+SFTP
+SFTP put
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+sftp
+</server>
+ <name>
+SFTP put
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file602.txt sftp://%HOSTIP:%SSHPORT/%PWD/log/upload.602
+</command>
+<file name="log/file602.txt">
+Test data
+for ssh upload test
+</file>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<upload>
+Test data
+for ssh upload test
+</upload>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>
diff --git a/tests/data/test603 b/tests/data/test603
new file mode 100644
index 0000000000000000000000000000000000000000..96894df98f0683feb2d8baddfe4341ec62e17581
--- /dev/null
+++ b/tests/data/test603
@@ -0,0 +1,43 @@
+<testcase>
+<info>
+<keywords>
+SCP
+SCP upload
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+scp
+</server>
+ <name>
+SCP upload
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file603.txt scp://%HOSTIP:%SSHPORT/%PWD/log/upload.603
+</command>
+<file name="log/file603.txt">
+Test data
+for ssh upload test
+</file>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<upload>
+Test data
+for ssh upload test
+</upload>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>