diff --git a/testing/btest/Baseline/scripts.base.protocols.http.http-filename/http.log b/testing/btest/Baseline/scripts.base.protocols.http.http-filename/http.log
new file mode 100644
index 0000000000..ada05f67d4
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.protocols.http.http-filename/http.log
@@ -0,0 +1,10 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	http
+#open	2016-06-15-05-55-29
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	trans_depth	method	host	uri	referrer	version	user_agent	request_body_len	response_body_len	status_code	status_msg	info_code	info_msg	tags	username	password	proxied	orig_fuids	orig_filenames	orig_mime_types	resp_fuids	resp_filenames	resp_mime_types
+#types	time	string	addr	port	addr	port	count	string	string	string	string	string	string	count	count	count	string	count	string	set[enum]	string	string	set[string]	vector[string]	vector[string]	vector[string]	vector[string]	vector[string]	vector[string]
+1445000735.104954	CXWv6p3arKYeMETxOg	10.1.9.63	63526	54.175.222.246	80	1	GET	httpbin.org	/response-headers?Content-Type=application/octet-stream; charset=UTF-8&Content-Disposition=attachment; filename="test.json"	-	1.1	curl/7.45.0	0	191	200	OK	-	-	(empty)	-	-	-	-	-	-	FygKthZCYFLgVzwY8	test.json	text/json
+#close	2016-06-15-05-55-29
diff --git a/testing/btest/Traces/http/http-filename.pcap b/testing/btest/Traces/http/http-filename.pcap
new file mode 100644
index 0000000000..204c6b4005
Binary files /dev/null and b/testing/btest/Traces/http/http-filename.pcap differ
diff --git a/testing/btest/scripts/base/protocols/http/http-filename.bro b/testing/btest/scripts/base/protocols/http/http-filename.bro
new file mode 100644
index 0000000000..b20bbddafe
--- /dev/null
+++ b/testing/btest/scripts/base/protocols/http/http-filename.bro
@@ -0,0 +1,8 @@
+# This tests that the HTTP analyzer handles filenames over HTTP correctly.
+#
+# @TEST-EXEC: bro -r $TRACES/http/http-filename.pcap %INPUT
+# @TEST-EXEC: btest-diff http.log
+
+# The base analysis scripts are loaded by default.
+#@load base/protocols/http
+