diff --git a/t/account-manager.cgi.t b/t/account-manager.cgi.t
index adfa4fc33e61e96ee9fbad680c92d5354570435e..e9105fb3ee4c4b5e424db356e8842df70f493546 100755
--- a/t/account-manager.cgi.t
+++ b/t/account-manager.cgi.t
@@ -30,7 +30,7 @@ subtest start_page => sub {
     diag($out) if $ENV{TEST_DEBUG};
     like(
         $out,
-        qr{^Content-Type: text/html\r\n\r\n},
+        qr{^Content-Type: text/html; charset=utf8\r\n\r\n},
         'HTTP headers'
     );
     like(
@@ -40,7 +40,7 @@ subtest start_page => sub {
     );
     like(
         $out,
-        qr{<button id="start_testing">Go on testing the service</button>},
+        qr{<a href="\?action=select_sp" class="button">Get started</a>},
         'start button'
     );
     is($err, '', 'empty stderr');
@@ -57,7 +57,7 @@ subtest sp_selection_page => sub {
     diag($out) if $ENV{TEST_DEBUG};
     like(
         $out,
-        qr{^Content-Type: text/html\r\n\r\n},
+        qr{^Content-Type: text/html; charset=utf8\r\n\r\n},
         'HTTP headers'
     );
     like(
@@ -84,7 +84,7 @@ subtest email_selection_page_missing_parameter => sub {
     diag($out) if $ENV{TEST_DEBUG};
     like(
         $out,
-        qr{^Content-Type: text/html\r\n\r\n},
+        qr{^Content-Type: text/html; charset=utf8\r\n\r\n},
         'HTTP headers'
     );
     like(
@@ -112,7 +112,7 @@ subtest email_selection_page_wrong_parameter => sub {
     diag($out) if $ENV{TEST_DEBUG};
     like(
         $out,
-        qr{^Content-Type: text/html\r\n\r\n},
+        qr{^Content-Type: text/html; charset=utf8\r\n\r\n},
         'HTTP headers'
     );
     like(