diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index e34974ea11d5e5609e0173e026667b78cae8d5f4..2a0396b7f98516080352aaae51c736d894abcd3d 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	\
  test223 test224 test206 test207 test208 test209 test213 test240	\
  test241 test242 test519 test214 test215 test216 test217 test218	\
  test199 test225 test226 test227 test230 test231 test232 test228	\
- test229 test233 test234 test235 test236 test520
+ test229 test233 test234 test235 test236 test520 test237 test238
 
 # The following tests have been removed from the dist since they no longer
 # work. We need to fix the test suite's FTPS server first, then bring them
diff --git a/tests/data/test237 b/tests/data/test237
new file mode 100644
index 0000000000000000000000000000000000000000..1a5f0e275a5a7981ea2dc85a60d77d537bb3f586
--- /dev/null
+++ b/tests/data/test237
@@ -0,0 +1,34 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP getting bad host in 227-response to PASV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/237 --disable-epsv
+</command>
+<file name="log/ftpserver.cmd">
+REPLY PASV 227 Entering Passiv Mode (1218,91,256,127,127,127)
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+# curl: (15) Can't resolve new host 1218.91.256.127:32639
+# 15 => CURLE_FTP_CANT_GET_HOST
+<errorcode>
+15
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+PASV
+</protocol>
+</verify>
diff --git a/tests/data/test238 b/tests/data/test238
new file mode 100644
index 0000000000000000000000000000000000000000..c314f6b7c004359ea3a721af7a374b4107db5f45
--- /dev/null
+++ b/tests/data/test238
@@ -0,0 +1,33 @@
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP getting bad port in 229-response to EPSV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/238
+</command>
+<file name="log/ftpserver.cmd">
+REPLY EPSV 229 Entering Passiv Mode (|||1000000|)
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+# 7 => CURLE_COULDNT_CONNECT
+<errorcode>
+7
+</errorcode>
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+EPSV
+</protocol>
+</verify>