diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 9a397e1b6b..60d6acf6cc 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -35,5 +35,5 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test256 test257 test258 test259 test260 test261 test262 test263 test264   \
  test265 test266 test267 test268 test269 test270 test271 test272 test273   \
  test274 test275 test524 test525 test276 test277 test526 test527 test528   \
- test530 DISABLED test278 test279
+ test530 DISABLED test278 test279 test531
 
diff --git a/tests/data/test236 b/tests/data/test236
index 1399e4c8b2..29d739f922 100644
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -27,6 +27,7 @@ EPSV
 TYPE I
 SIZE 236
 STOR 236
+QUIT
 </protocol>
 
 #  (25) Failed FTP upload: 550
diff --git a/tests/data/test531 b/tests/data/test531
new file mode 100644
index 0000000000..0909e812a9
--- /dev/null
+++ b/tests/data/test531
@@ -0,0 +1,55 @@
+<info>
+<keywords>
+FTP
+PORT
+STOR
+</keywords>
+</info>
+# Server-side
+<reply>
+<data>
+</data>
+<servercmd>
+REPLY STOR 425 Permission Denied. File Exists.
+</servercmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+<tool>
+lib525
+</tool>
+ <name>
+FTP PORT upload using multi interface and get 425 response
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/path/531 log/upload531
+</command>
+<file name="log/upload531">
+Moooooooooooo
+don't upload this
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^PORT .*
+^EPRT .*
+^LPRT .*
+</strip>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+CWD path
+PORT 127,0,0,1,5,109
+TYPE I
+STOR 531
+QUIT
+</protocol>
+
+</verify>