diff --git a/admin/tool/phpunit/cli/init.bat b/admin/tool/phpunit/cli/init.bat
index adc6414b5e5..d57029f72f3 100644
--- a/admin/tool/phpunit/cli/init.bat
+++ b/admin/tool/phpunit/cli/init.bat
@@ -1,4 +1,6 @@
 @ECHO OFF
+ECHO Initialising Moodle PHPUnit test environment...
+
 CALL php %~dp0\util.php --diag > NUL 2>&1
 
 IF ERRORLEVEL 133 GOTO drop
diff --git a/admin/tool/phpunit/cli/init.sh b/admin/tool/phpunit/cli/init.sh
index fc344f713e0..b3616ee722c 100755
--- a/admin/tool/phpunit/cli/init.sh
+++ b/admin/tool/phpunit/cli/init.sh
@@ -6,7 +6,7 @@ CLIDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 UTIL="$CLIDIR/util.php"
 
-echo "Initialising test database and creating phpunit.xml configuration..."
+echo "Initialising Moodle PHPUnit test environment..."
 
 DIGERROR=`php $UTIL --diag`
 DIAG=$?
diff --git a/lib/phpunit/bootstraplib.php b/lib/phpunit/bootstraplib.php
index 6a61b0d34db..03b895d1f4f 100644
--- a/lib/phpunit/bootstraplib.php
+++ b/lib/phpunit/bootstraplib.php
@@ -45,10 +45,10 @@ function phpunit_bootstrap_error($errorcode, $text = '') {
             $text = 'Configuration problem: '.$text;
             break;
         case 132:
-            $text = 'Database was not initialised to run unit tests, please use "php admin/tool/phpunit/cli/util.php --install"';
+            $text = "Moodle PHPUnit environment is not initialised, please use:\n php admin/tool/phpunit/cli/util.php --install";
             break;
         case 133:
-            $text = 'Database was initialised for different version, please use "php admin/tool/phpunit/cli/util.php --drop; php admin/tool/phpunit/cli/util.php --install"';
+            $text = "Moodle PHPUnit environment was initialised for different version, please use:\n php admin/tool/phpunit/cli/util.php --drop\n php admin/tool/phpunit/cli/util.php --install";
             break;
         case 134:
             $text = 'Can not create main configuration file, please verify dirroot permissions.';
diff --git a/lib/phpunit/lib.php b/lib/phpunit/lib.php
index a52a6512d12..253ee2c972c 100644
--- a/lib/phpunit/lib.php
+++ b/lib/phpunit/lib.php
@@ -673,9 +673,9 @@ class phpunit_util {
         if ($DB->get_tables()) {
             list($errorcode, $message) = phpunit_util::testing_ready_problem();
             if ($errorcode) {
-                phpunit_bootstrap_error(133, 'Database tables already installed, drop the site first.');
+                phpunit_bootstrap_error(133, 'Database tables already present, Moodle PHPUnit test environment can not be initialised');
             } else {
-                phpunit_bootstrap_error(0, 'Test database is already initialised');
+                phpunit_bootstrap_error(0, 'Moodle PHPUnit test environment is already initialised');
             }
         }