diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 22d6eca235..bbd97853a3 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -209,7 +209,7 @@ test1548 test1549 test1550 test1551 test1552 test1553 test1554 test1555 \
test1556 test1557 test1558 test1559 test1560 test1561 test1562 test1563 \
test1564 test1565 test1566 test1567 test1568 test1569 test1570 test1571 \
test1572 test1573 test1574 test1575 test1576 test1577 test1578 test1579 \
-test1580 test1581 test1582 test1583 \
+test1580 test1581 test1582 test1583 test1584 test1585 \
\
test1590 test1591 test1592 test1593 test1594 test1595 test1596 test1597 \
test1598 test1599 test1600 test1601 test1602 test1603 test1604 test1605 \
diff --git a/tests/data/test1584 b/tests/data/test1584
new file mode 100644
index 0000000000..ab8ba1ecb3
--- /dev/null
+++ b/tests/data/test1584
@@ -0,0 +1,55 @@
+
+
+
+
+HTTP
+HTTP GET
+-J
+
+
+
+#
+
+
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=log/server/name%TESTNUMBER
+
+12345
+
+
+
+#
+# Client-side
+
+
+http
+
+
+HTTP GET with -J and Content-Disposition including path
+
+
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+
+
+12345
+
+
+
+
diff --git a/tests/data/test1585 b/tests/data/test1585
new file mode 100644
index 0000000000..6875ac8603
--- /dev/null
+++ b/tests/data/test1585
@@ -0,0 +1,55 @@
+
+
+
+
+HTTP
+HTTP GET
+-J
+
+
+
+#
+
+
+HTTP/1.1 200 OK
+Date: Tue, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Content-Disposition: filename=log\server\name%TESTNUMBER
+
+12345
+
+
+
+#
+# Client-side
+
+
+http
+
+
+HTTP GET with -J and Content-Disposition including DOS path
+
+
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+GET /%TESTNUMBER HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
+Accept: */*
+
+
+
+12345
+
+
+
+