diff --git a/test/sharness/t0117-gateway-block.sh b/test/sharness/t0117-gateway-block.sh
index c9e3a4713c82..46cb8af3e3c4 100755
--- a/test/sharness/t0117-gateway-block.sh
+++ b/test/sharness/t0117-gateway-block.sh
@@ -49,6 +49,12 @@ test_expect_success "Create text fixtures" '
     grep "< X-Content-Type-Options: nosniff" curl_output
     '
 
+    test_expect_success "GET for application/vnd.ipld.raw with query filename includes Content-Disposition with custom filename" '
+    curl -svX GET -H "Accept: application/vnd.ipld.raw" "http://127.0.0.1:$GWAY_PORT/ipfs/$ROOT_DIR_CID/dir/ascii.txt?filename=foobar.bin" >/dev/null 2>curl_output_filename &&
+    cat curl_output_filename &&
+    grep "< Content-Disposition: attachment\; filename=\"foobar.bin\"" curl_output_filename
+    '
+
 # Cache control HTTP headers
 # (basic checks, detailed behavior is tested in  t0116-gateway-cache.sh)
 
diff --git a/test/sharness/t0118-gateway-car.sh b/test/sharness/t0118-gateway-car.sh
index 796c3c33947c..5b0306e0717f 100755
--- a/test/sharness/t0118-gateway-car.sh
+++ b/test/sharness/t0118-gateway-car.sh
@@ -110,6 +110,12 @@ test_launch_ipfs_daemon_without_network
     grep "< Accept-Ranges: none" curl_output
     '
 
+    test_expect_success "GET for application/vnd.ipld.car with query filename includes Content-Disposition with custom filename" '
+    curl -svX GET -H "Accept: application/vnd.ipld.car" "http://127.0.0.1:$GWAY_PORT/ipfs/$ROOT_DIR_CID/subdir/ascii.txt?filename=foobar.car" > curl_output_filename 2>&1 &&
+    cat curl_output_filename &&
+    grep "< Content-Disposition: attachment\; filename=\"foobar.car\"" curl_output_filename
+    '
+
 # Cache control HTTP headers
 
     test_expect_success "GET response for application/vnd.ipld.car includes a weak Etag" '