diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 21504be43..93eb4a431 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -142,7 +142,7 @@ test1396 test1397 test1398 \
\
test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \
test1408 test1409 test1410 test1411 test1412 test1413 test1414 test1415 \
-test1416 test1417 test1418 test1419 test1420 test1421 \
+test1416 test1417 test1418 test1419 test1420 test1421 test1422 test1423 \
\
test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \
test1436 \
diff --git a/tests/data/test1422 b/tests/data/test1422
new file mode 100644
index 000000000..9b436cc4e
--- /dev/null
+++ b/tests/data/test1422
@@ -0,0 +1,63 @@
+
+
+
+HTTP
+HTTP GET
+-J
+
+
+
+#
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 0
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=name1422; charset=funny; option=strange
+
+
+
+
+#
+# Client-side
+
+# this relies on the debug feature to allow us to set directory to store the
+# -O and -J output in, using the CURL_TESTDIR variable
+
+debug
+
+
+http
+
+
+HTTP GET with -O -J and Content-Disposition (empty file)
+
+
+CURL_TESTDIR=%PWD/log
+
+
+http://%HOSTIP:%HTTPPORT/1422 -J -O file://%PWD/log/name1422
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1422 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+
+
+
+
+
+
+
diff --git a/tests/data/test1423 b/tests/data/test1423
new file mode 100644
index 000000000..962d6c990
--- /dev/null
+++ b/tests/data/test1423
@@ -0,0 +1,56 @@
+
+
+
+HTTP
+HTTP GET
+
+
+
+#
+
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 0
+Connection: close
+Content-Type: text/html
+
+
+
+
+#
+# Client-side
+
+
+http
+
+
+HTTP GET -o fname without Content-Disposition (empty file)
+
+
+http://%HOSTIP:%HTTPPORT/1423 -o log/outfile1423 file://%PWD/log/outfile1423
+
+
+perl %SRCDIR/libtest/notexists.pl log/1423
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+^User-Agent:.*
+
+
+GET /1423 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+
+
+
+
+
+
+