diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 338ec7ac1..5012165e3 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -21,7 +21,8 @@ test74 test75 test76 test77 test78 test147 test148 test506 test79 \
test80 test81 test82 test83 test84 test85 test86 test87 test507 \
test149 test88 test89 test90 test508 test91 test92 test203 test93 \
test94 test95 test509 test510 test97 test98 test99 test150 test151 \
-test152 test153 test154 test155 test156 test157 test158 test159 test511
+test152 test153 test154 test155 test156 test157 test158 test159 test511 \
+test160
# 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/test160 b/tests/data/test160
new file mode 100644
index 000000000..48f6aa549
--- /dev/null
+++ b/tests/data/test160
@@ -0,0 +1,66 @@
+# Server-side
+
+
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Length: 9
+
+surprise
+
+
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+surprise2
+
+
+
+wait 1
+
+
+
+# Client-side
+
+
+http
+
+
+HTTP with delayed close, conn reuse, connection reset and retry
+
+
+http://%HOSTIP:%HOSTPORT/want/160 http://%HOSTIP:%HOSTPORT/wantmore/1600001
+
+
+
+# Verify data after the test has been "shot"
+
+
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Content-Length: 9
+
+surprise
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Connection: close
+
+surprise2
+
+
+
+^User-Agent:.*
+
+
+GET /want/160 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: */*
+
+GET /wantmore/1600001 HTTP/1.1
+Host: 127.0.0.1:8999
+Pragma: no-cache
+Accept: */*
+
+
+