diff --git a/admin/report/unittest/dbtest.php b/admin/report/unittest/dbtest.php
index a2468e82a5b..134b900d445 100644
--- a/admin/report/unittest/dbtest.php
+++ b/admin/report/unittest/dbtest.php
@@ -103,7 +103,7 @@ if (!empty($tests)) {
 }
 
 // Print the form for adjusting options.
-print_simple_box_start('center', '70%');
+echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
 echo '<form method="post" action="dbtest.php">';
 echo '<div>';
 print_heading("Run functional database tests"); // TODO: localise
@@ -137,7 +137,7 @@ where order of parameters is: dblibrary, dbtype, dbhost, dbuser, dbpass, dbname,
 echo '<p><input type="submit" value="' . get_string('runtests', 'simpletest') . '" /></p>';
 echo '</div>';
 echo '</form>';
-print_simple_box_end();
+echo $OUTPUT->box_end();
 
 // Footer.
 admin_externalpage_print_footer();
diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php
index 1b7edba56d3..e029979607a 100644
--- a/admin/report/unittest/index.php
+++ b/admin/report/unittest/index.php
@@ -100,7 +100,7 @@ if (!is_null($path)) {
     $formheader = get_string('rununittests', $langfile);
 }
 // Print the form for adjusting options.
-print_box_start('generalbox boxwidthwide boxaligncenter');
+echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
 print_heading($formheader);
 echo '<form method="get" action="index.php">';
 echo '<fieldset class="invisiblefieldset">';
@@ -118,9 +118,9 @@ echo '</p>';
 echo '<input type="submit" value="' . get_string('runtests', $langfile) . '" />';
 echo '</fieldset>';
 echo '</form>';
-print_box_end();
+echo $OUTPUT->box_end();
 
-print_box_start('generalbox boxwidthwide boxaligncenter');
+echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
 if (true) {
     echo "<p>Fake test tables are disabled for now, sorry</p>"; // DO NOT LOCALISE!!! to be removed soon
 
@@ -128,7 +128,7 @@ if (true) {
     print_heading(get_string('testdboperations', 'simpletest'));
     // TODO: localise
     echo '<p>Please add $CFG->unittestprefix="tst_"; or some other unique test table prefix if you want to execute all tests';
-    
+
 } else {
     print_heading(get_string('testdboperations', 'simpletest'));
     echo '<p>'.get_string('unittestprefixsetting', 'simpletest', $CFG).'</p>';
@@ -140,7 +140,7 @@ if (true) {
     echo '</fieldset>';
     echo '</form>';
 }
-print_box_end();
+echo $OUTPUT->box_end();
 
 
 // Footer.