diff --git a/t/web/html_template.t b/t/web/html_template.t
index abb895c75a5..7d071da3702 100644
--- a/t/web/html_template.t
+++ b/t/web/html_template.t
@@ -15,6 +15,7 @@ my $content  = Encode::decode("UTF-8", "测试");
 {
     $m->follow_link_ok( { id => 'admin-global-templates' }, '-> Templates' );
     $m->follow_link_ok( { text => 'Autoreply in HTML' },    '-> Autoreply in HTML' );
+    $m->follow_link_ok( { text => 'Content' },              '-> Content' );
 
     $m->submit_form(
         form_name => 'ModifyTemplate',
diff --git a/t/web/template.t b/t/web/template.t
index 4bca733c65b..69a570fef9b 100644
--- a/t/web/template.t
+++ b/t/web/template.t
@@ -60,10 +60,12 @@ $m->form_name('ModifyTemplate');
 is($m->value('Type'), 'Perl', 'now that we have ExecuteCode we can update Type to Perl');
 
 { # 21152: Each time you save a Template a newline is chopped off the front
+  # go to Content tab
+  $m->follow_link( text => 'Content' );
+
   $m->form_name('ModifyTemplate');
   my $content;
 
-
   TODO: {
 
     local $TODO = "WWW::Mechanize doesn't strip newline following <textarea> tag like browsers do";