diff --git a/admin/tool/behat/cli/init.php b/admin/tool/behat/cli/init.php
index d4300d989bb..c24eaeacd55 100644
--- a/admin/tool/behat/cli/init.php
+++ b/admin/tool/behat/cli/init.php
@@ -96,25 +96,13 @@ if ($options['parallel']) {
 $cwd = getcwd();
 $output = null;
 
-$installcomposer = true;
 // If behat dependencies not downloaded then do it first, else symfony/process can't be used.
-if ($options['parallel'] && !file_exists(__DIR__ . "/../../../../vendor/autoload.php")) {
-    $installcomposer = false;
-    testing_update_composer_dependencies();
-}
+testing_update_composer_dependencies();
 
+// Check whether the behat test environment needs to be updated.
 chdir(__DIR__);
 exec("php $utilfile --diag $paralleloption", $output, $code);
 
-// Check if composer needs to be updated.
-if ($installcomposer &&
-        ($code == BEHAT_EXITCODE_INSTALL || $code == BEHAT_EXITCODE_REINSTALL || $code == BEHAT_EXITCODE_COMPOSER)) {
-    testing_update_composer_dependencies();
-    // Check again for behat test site and see if it's install or re-install.
-    chdir(__DIR__);
-    exec("php $utilfile --diag $paralleloption", $output, $code);
-}
-
 if ($code == 0) {
     echo "Behat test environment already installed\n";
 
diff --git a/admin/tool/phpunit/cli/init.php b/admin/tool/phpunit/cli/init.php
index eb807ee4d14..078527784d0 100644
--- a/admin/tool/phpunit/cli/init.php
+++ b/admin/tool/phpunit/cli/init.php
@@ -39,6 +39,7 @@ require_once(__DIR__.'/../../../../lib/phpunit/bootstraplib.php');
 require_once(__DIR__.'/../../../../lib/testing/lib.php');
 
 echo "Initialising Moodle PHPUnit test environment...\n";
+testing_update_composer_dependencies();
 
 $output = null;
 exec('php --version', $output, $code);
@@ -72,4 +73,6 @@ if ($code == 0) {
 
 passthru("php util.php --buildconfig", $code);
 
+echo "\n";
+echo "PHPUnit test environment setup complete.\n";
 exit(0);