diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index f802b1ac9..d48302223 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test231 test1000 test1001 test1002 test1003 test1004 test1005 test1006    \
  test615 test1007 test541 test1010 test1011 test1012 test542 test543       \
  test536 test1008 test1009 test2000 test2001 test2002 test2003 test35      \
- test544 test545
+ test544 test545 test2004
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1004 b/tests/data/test1004
index bc8396833..955163b36 100644
--- a/tests/data/test1004
+++ b/tests/data/test1004
@@ -52,5 +52,8 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
 </protocol>
+<valgrind>
+disable
+</valgrind>
 </verify>
 </testcase>
diff --git a/tests/data/test2004 b/tests/data/test2004
new file mode 100644
index 000000000..41cd749cd
--- /dev/null
+++ b/tests/data/test2004
@@ -0,0 +1,64 @@
+<testcase>
+<info>
+<keywords>
+TFTP
+TFTP RRQ
+FILE
+SFTP
+SCP
+multiprotocol
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+Test data
+for tftp test
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+tftp
+sftp
+</server>
+ <name>
+TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order
+ </name>
+ <command>
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//2004 sftp://%HOSTIP:%SSHPORT%PWD/log/file2004s.txt file://localhost/%PWD/log/test2004f.txt scp://%HOSTIP:%SSHPORT%PWD/log/file2004c.txt file://localhost/%PWD/log/test2004f.txt sftp://%HOSTIP:%SSHPORT%PWD/log/file2004s.txt tftp://%HOSTIP:%TFTPPORT//2004
+</command>
+<file name="log/file2004s.txt">
+Test data
+for sftp test
+</file>
+<file name="log/file2004f.txt">
+Test data
+for file test
+</file>
+<file name="log/file2004c.txt">
+Test data
+for scp test
+</file>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+opcode: 1
+filename: /2004
+mode: octet
+opcode: 1
+filename: /2004
+mode: octet
+</protocol>
+<valgrind>
+disable
+</valgrind>
+</verify>
+</testcase>