diff --git a/app/letters/utils.py b/app/letters/utils.py
index a60078012..f97824b9b 100644
--- a/app/letters/utils.py
+++ b/app/letters/utils.py
@@ -88,7 +88,7 @@ def upload_letter_pdf(notification, pdf_data, precompiled=False):
     upload_file_name = get_letter_pdf_filename(
         notification.reference,
         notification.service.crown,
-        is_scan_letter=precompiled,
+        is_scan_letter=precompiled or notification.key_type == KEY_TYPE_TEST,
         postage=notification.postage
     )
 
diff --git a/tests/app/celery/test_letters_pdf_tasks.py b/tests/app/celery/test_letters_pdf_tasks.py
index 5bd72c7f0..fd500c062 100644
--- a/tests/app/celery/test_letters_pdf_tasks.py
+++ b/tests/app/celery/test_letters_pdf_tasks.py
@@ -27,7 +27,7 @@ from app.celery.letters_pdf_tasks import (
     _move_invalid_letter_and_update_status,
     _sanitise_precompiled_pdf
 )
-from app.letters.utils import get_letter_pdf_filename, ScanErrorType
+from app.letters.utils import ScanErrorType
 from app.models import (
     KEY_TYPE_NORMAL,
     KEY_TYPE_TEST,
@@ -120,14 +120,25 @@ def test_create_letters_pdf_calls_s3upload(mocker, sample_letter_notification):
 
     create_letters_pdf(sample_letter_notification.id)
 
-    filename = get_letter_pdf_filename(
-        reference=sample_letter_notification.reference,
-        crown=sample_letter_notification.service.crown
-    )
-
     mock_s3.assert_called_with(
         bucket_name=current_app.config['LETTERS_PDF_BUCKET_NAME'],
-        file_location=filename,
+        file_location='2017-12-05/NOTIFY.FOO.D.2.C.C.20171204173100.PDF',
+        filedata=b'\x00\x01',
+        region=current_app.config['AWS_REGION']
+    )
+
+
+@freeze_time("2017-12-04 17:31:00")
+def test_create_letters_pdf_calls_s3upload_for_test_letters(mocker, sample_letter_notification):
+    mocker.patch('app.celery.letters_pdf_tasks.get_letters_pdf', return_value=(b'\x00\x01', '1'))
+    mock_s3 = mocker.patch('app.letters.utils.s3upload')
+    sample_letter_notification.key_type = 'test'
+
+    create_letters_pdf(sample_letter_notification.id)
+
+    mock_s3.assert_called_with(
+        bucket_name=current_app.config['TEST_LETTERS_BUCKET_NAME'],
+        file_location='NOTIFY.FOO.D.2.C.C.20171204173100.PDF',
         filedata=b'\x00\x01',
         region=current_app.config['AWS_REGION']
     )