diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss
index c7becdee2..4fbd20f8f 100644
--- a/app/assets/stylesheets/_grids.scss
+++ b/app/assets/stylesheets/_grids.scss
@@ -26,6 +26,19 @@
   @include grid-column(7/8);
 }
 
+%top-gutter,
+.top-gutter {
+  @extend %contain-floats;
+  display: block;
+  margin-top: $gutter;
+  clear: both;
+}
+
+.top-gutter-4-3 {
+  @extend %top-gutter;
+  margin-top: $gutter * 4 / 3;
+}
+
 %bottom-gutter,
 .bottom-gutter {
   @extend %contain-floats;
diff --git a/app/config.py b/app/config.py
index 9d3a34671..d48821d8b 100644
--- a/app/config.py
+++ b/app/config.py
@@ -57,7 +57,7 @@ class Config(object):
     CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload'
     DESKPRO_PERSON_EMAIL = 'donotreply@notifications.service.gov.uk'
     ACTIVITY_STATS_LIMIT_DAYS = 7
-    TEST_MESSAGE_FILENAME = 'Test message'
+    TEST_MESSAGE_FILENAME = 'One-off message'
 
     STATSD_ENABLED = False
     STATSD_HOST = "statsd.hostedgraphite.com"
diff --git a/app/main/views/send.py b/app/main/views/send.py
index cbf7acf0e..2ff3cef75 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -282,13 +282,25 @@ def send_test_step(service_id, template_id, step_index):
     template.values = get_normalised_send_test_values_from_session()
     template.values[current_placeholder] = None
 
+    if (
+        request.endpoint == 'main.send_one_off_step' and
+        step_index == 0 and
+        template.template_type != 'letter'
+    ):
+        skip_link = (
+            'Use my {}'.format(first_column_headings[template.template_type][0]),
+            url_for('.send_test', service_id=service_id, template_id=template.id),
+        )
+    else:
+        skip_link = None
+
     return render_template(
         'views/send-test.html',
-        page_title=get_send_test_page_title(template.template_type, request.endpoint),
+        page_title=get_send_test_page_title(template.template_type, get_help_argument()),
         template=template,
         form=form,
+        skip_link=skip_link,
         optional_placeholder=optional_placeholder,
-        help=get_help_argument(),
         back_link=back_link,
     )
 
@@ -549,12 +561,9 @@ def all_placeholders_in_session(placeholders):
     )
 
 
-def get_send_test_page_title(template_type, endpoint):
-    if get_help_argument():
+def get_send_test_page_title(template_type, help_argument):
+    if help_argument:
         return 'Example text message'
     if template_type == 'letter':
         return 'Print a test letter'
-    return {
-        'main.send_test_step': 'Send yourself a test',
-        'main.send_one_off_step': 'Send one-off message',
-    }[endpoint]
+    return 'Send one-off message'
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index 05eae2aeb..bae3939cc 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -15,10 +15,20 @@
   </h1>
 
   <form method="post" class="js-stick-at-top-when-scrolling" data-module="autofocus">
-    {{ textbox(
-      form.placeholder_value,
-      hint='Optional' if optional_placeholder else None
-    ) }}
+    <div class="grid-row">
+      <div class="column-two-thirds">
+        {{ textbox(
+          form.placeholder_value,
+          hint='Optional' if optional_placeholder else None,
+          width='1-1',
+        ) }}
+      </div>
+      {% if skip_link %}
+        <div class="column-one-third">
+          <a href="{{ skip_link[1] }}" class="top-gutter-4-3">{{ skip_link[0] }}</a>
+        </div>
+      {% endif %}
+    </div>
     {{ page_footer('Next', back_link=back_link) }}
   </form>
 
diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html
index e74e8e0a5..31ce14918 100644
--- a/app/templates/views/templates/_template.html
+++ b/app/templates/views/templates/_template.html
@@ -13,8 +13,8 @@
           </a>
         </div>
         <div class="{{ 'column-half' if template.template_type == 'letter' else 'column-third' }}">
-          <a href="{{ url_for(".send_test", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
-            {{ 'Print a test letter' if template.template_type == 'letter' else 'Send yourself a test' }}
+          <a href="{{ url_for(".send_one_off", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
+            {{ 'Print a test letter' if template.template_type == 'letter' else 'Send one-off message' }}
           </a>
         </div>
         {% endif %}
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index ded6677a5..eeb7d6ecf 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -286,7 +286,6 @@ def test_send_test_sms_message(
     mock_get_detailed_service_for_today,
 ):
 
-    expected_data = {'data': 'phone number\r\n07700 900762\r\n', 'file_name': 'Test message'}
     mocker.patch('app.main.views.send.s3download', return_value='phone number\r\n+4412341234')
 
     response = logged_in_client.get(
@@ -294,7 +293,11 @@ def test_send_test_sms_message(
         follow_redirects=True
     )
     assert response.status_code == 200
-    mock_s3_upload.assert_called_with(service_one['id'], expected_data, 'eu-west-1')
+    mock_s3_upload.assert_called_with(
+        service_one['id'],
+        {'data': 'phone number\r\n07700 900762\r\n', 'file_name': 'One-off message'},
+        'eu-west-1'
+    )
 
 
 @pytest.mark.parametrize('endpoint, template_mock, expected_session_contents', [
@@ -336,7 +339,7 @@ def test_send_test_step_redirects_if_session_not_setup(
     (
         mock_get_service_template_with_placeholders,
         partial(url_for, 'main.send_test'),
-        'Send yourself a test',
+        'Send one-off message',
     ),
     (
         mock_get_service_template_with_placeholders,
@@ -356,7 +359,7 @@ def test_send_test_step_redirects_if_session_not_setup(
     (
         mock_get_service_email_template,
         partial(url_for, 'main.send_test'),
-        'Send yourself a test',
+        'Send one-off message',
     ),
     (
         mock_get_service_email_template,
@@ -397,6 +400,44 @@ def test_send_one_off_or_test_has_correct_page_titles(
     assert page.h1.text.strip() == expected_h1
 
 
+@pytest.mark.parametrize('template_mock, expected_link_text, expected_link_url', [
+    (mock_get_service_template, 'Use my phone number', partial(url_for, 'main.send_test')),
+    (mock_get_service_email_template, 'Use my email address', partial(url_for, 'main.send_test')),
+    (mock_get_service_letter_template, None, None),
+])
+def test_send_one_off_has_skip_link(
+    logged_in_client,
+    service_one,
+    fake_uuid,
+    mock_get_service_email_template,
+    mocker,
+    template_mock,
+    expected_link_text,
+    expected_link_url,
+):
+
+    template_mock(mocker)
+    mocker.patch('app.main.views.send.get_page_count_for_letter', return_value=99)
+
+    response = logged_in_client.get(
+        url_for('main.send_one_off_step', service_id=service_one['id'], template_id=fake_uuid, step_index=0),
+        follow_redirects=True
+    )
+    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+    skip_links = page.select('a.top-gutter-4-3')
+
+    assert response.status_code == 200
+
+    if expected_link_text and expected_link_url:
+        assert skip_links[0].text.strip() == expected_link_text
+        assert skip_links[0]['href'] == expected_link_url(
+            service_id=service_one['id'],
+            template_id=fake_uuid,
+        )
+    else:
+        assert not skip_links
+
+
 @pytest.mark.parametrize('endpoint, expected_redirect, send_test_values', [
     (
         'main.send_test_step',
@@ -553,7 +594,6 @@ def test_send_test_email_message_without_placeholders(
     fake_uuid,
 ):
 
-    expected_data = {'data': 'email address\r\ntest@user.gov.uk\r\n', 'file_name': 'Test message'}
     mocker.patch('app.main.views.send.s3download', return_value='email address\r\ntest@user.gov.uk')
 
     response = logged_in_client.get(
@@ -561,7 +601,11 @@ def test_send_test_email_message_without_placeholders(
         follow_redirects=True
     )
     assert response.status_code == 200
-    mock_s3_upload.assert_called_with(service_one['id'], expected_data, 'eu-west-1')
+    mock_s3_upload.assert_called_with(
+        service_one['id'],
+        {'data': 'email address\r\ntest@user.gov.uk\r\n', 'file_name': 'One-off message'},
+        'eu-west-1'
+    )
 
 
 def test_send_test_sms_message_with_placeholders_shows_first_field(
@@ -780,7 +824,7 @@ def test_send_test_sms_message_puts_submitted_data_in_session_and_file(
         service_one['id'],
         {
             'data': 'name,phone number\r\nJo,07700 900762\r\n',
-            'file_name': 'Test message'
+            'file_name': 'One-off message'
         },
         'eu-west-1'
     )
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index cf0bc3fdd..acafae751 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -44,11 +44,11 @@ def test_should_show_page_for_one_template(
     ),
     (
         ['send_texts', 'send_emails', 'send_letters'],
-        ['.send_messages', '.send_test']
+        ['.send_messages', '.send_one_off']
     ),
     (
         ['send_texts', 'send_emails', 'send_letters', 'manage_templates'],
-        ['.send_messages', '.send_test', '.edit_service_template']
+        ['.send_messages', '.send_one_off', '.edit_service_template']
     ),
 ])
 def test_should_be_able_to_view_a_template_with_links(