diff --git a/test/integration/admin_area/invoices_test.rb b/test/integration/admin_area/invoices_test.rb
index 204f953d8..887f57212 100644
--- a/test/integration/admin_area/invoices_test.rb
+++ b/test/integration/admin_area/invoices_test.rb
@@ -13,7 +13,7 @@ class AdminAreaInvoicesIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal 'application/pdf', response.headers['Content-Type']
-    assert_equal 'attachment; filename="invoice-1.pdf"', response.headers['Content-Disposition']
+    assert_equal "attachment; filename=\"invoice-1.pdf\"; filename*=UTF-8''invoice-1.pdf", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
-end
\ No newline at end of file
+end
diff --git a/test/integration/admin_area/zones_test.rb b/test/integration/admin_area/zones_test.rb
index 468bbd8b6..bf7c07d7b 100644
--- a/test/integration/admin_area/zones_test.rb
+++ b/test/integration/admin_area/zones_test.rb
@@ -21,7 +21,7 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal 'text/plain', response.headers['Content-Type']
-    assert_equal 'attachment; filename="test.txt"', response.headers['Content-Disposition']
+    assert_equal "attachment; filename=\"test.txt\"; filename*=UTF-8''test.txt", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
 end
diff --git a/test/integration/registrant_area/domains_test.rb b/test/integration/registrant_area/domains_test.rb
index 11709dd5b..d2ca1c775 100644
--- a/test/integration/registrant_area/domains_test.rb
+++ b/test/integration/registrant_area/domains_test.rb
@@ -10,7 +10,7 @@ class RegistrantAreaDomainsIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal "#{Mime[:csv]}; charset=utf-8", response.headers['Content-Type']
-    assert_equal 'attachment; filename="domains.csv"', response.headers['Content-Disposition']
+    assert_equal "attachment; filename=\"domains.csv\"; filename*=UTF-8''domains.csv", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
 
@@ -19,7 +19,7 @@ class RegistrantAreaDomainsIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal Mime[:pdf], response.headers['Content-Type']
-    assert_equal 'attachment; filename="domains.pdf"', response.headers['Content-Disposition']
+    assert_equal "attachment; filename=\"domains.pdf\"; filename*=UTF-8''domains.pdf", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
 end
diff --git a/test/integration/registrar_area/contacts_test.rb b/test/integration/registrar_area/contacts_test.rb
index 2597518b1..a8e50aafa 100644
--- a/test/integration/registrar_area/contacts_test.rb
+++ b/test/integration/registrar_area/contacts_test.rb
@@ -10,7 +10,7 @@ class RegistrarAreaContactsIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal "#{Mime[:csv]}; charset=utf-8", response.headers['Content-Type']
-    assert_equal 'attachment; filename="contacts.csv"', response.headers['Content-Disposition']
+    assert_equal "attachment; filename=\"contacts.csv\"; filename*=UTF-8''contacts.csv", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
 
@@ -19,7 +19,7 @@ class RegistrarAreaContactsIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal Mime[:pdf], response.headers['Content-Type']
-    assert_equal 'attachment; filename="contacts.pdf"', response.headers['Content-Disposition']
+    assert_equal "attachment; filename=\"contacts.pdf\"; filename*=UTF-8''contacts.pdf", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
 end
diff --git a/test/integration/registrar_area/domains_test.rb b/test/integration/registrar_area/domains_test.rb
index eaa43e674..9936af593 100644
--- a/test/integration/registrar_area/domains_test.rb
+++ b/test/integration/registrar_area/domains_test.rb
@@ -13,7 +13,7 @@ class RegistrarAreaDomainsIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal "#{Mime[:csv]}; charset=utf-8", response.headers['Content-Type']
-    assert_equal %(attachment; filename="Domains_#{l(now, format: :filename)}.csv"),
+    assert_equal %(attachment; filename="Domains_#{l(now, format: :filename)}.csv; filename*=UTF-8''Domains_#{l(now, format: :filename)}.csv"),
                  response.headers['Content-Disposition']
     assert_not_empty response.body
   end
diff --git a/test/integration/registrar_area/invoices_test.rb b/test/integration/registrar_area/invoices_test.rb
index 1f43a5287..91c6afbd8 100644
--- a/test/integration/registrar_area/invoices_test.rb
+++ b/test/integration/registrar_area/invoices_test.rb
@@ -13,7 +13,7 @@ class RegistrarAreaInvoicesIntegrationTest < ApplicationIntegrationTest
 
     assert_response :ok
     assert_equal 'application/pdf', response.headers['Content-Type']
-    assert_equal 'attachment; filename="invoice-1.pdf"', response.headers['Content-Disposition']
+    assert_equal "attachment; filename=\"invoice-1.pdf\"; filename*=UTF-8''invoice-1.pdf", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
-end
\ No newline at end of file
+end
diff --git a/test/system/registrar_area/domains_test.rb b/test/system/registrar_area/domains_test.rb
index db51d7096..7a2f5f7f1 100644
--- a/test/system/registrar_area/domains_test.rb
+++ b/test/system/registrar_area/domains_test.rb
@@ -15,7 +15,7 @@ class RegistrarDomainsTest < ApplicationSystemTestCase
 
     visit registrar_domains_url
     click_button 'Download CSV'
-    assert_equal 'attachment; filename="Domains_2010-07-05_10.30.csv"', response_headers['Content-Disposition']
+    assert_equal "attachment; filename=\"Domains_2010-07-05_10.30.csv\"; filename*=UTF-8''Domains_2010-07-05_10.30.csv", response_headers['Content-Disposition']
     assert_equal expected_csv, page.body
   end
 end