diff --git a/admin/tool/langimport/classes/task/update_langpacks_task.php b/admin/tool/langimport/classes/task/update_langpacks_task.php
index 68b9e326d59..dfdcb5d41ba 100644
--- a/admin/tool/langimport/classes/task/update_langpacks_task.php
+++ b/admin/tool/langimport/classes/task/update_langpacks_task.php
@@ -45,6 +45,13 @@ class update_langpacks_task extends \core\task\scheduled_task {
      * Run langpack update
      */
     public function execute() {
+        global $CFG;
+
+        // No need to run upgrade, if skiplangupgrade is set.
+        if (!empty($CFG->skiplangupgrade)) {
+            return;
+        }
+
         $controller = new \tool_langimport\controller();
         if ($controller->update_all_installed_languages()) {
             foreach ($controller->info as $message) {
diff --git a/lib/behat/lib.php b/lib/behat/lib.php
index 7cc7761a3ff..e32bbb52465 100644
--- a/lib/behat/lib.php
+++ b/lib/behat/lib.php
@@ -155,7 +155,7 @@ function behat_clean_init_config() {
         'wwwroot', 'dataroot', 'dirroot', 'admin', 'directorypermissions', 'filepermissions',
         'umaskpermissions', 'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix',
         'dboptions', 'proxyhost', 'proxyport', 'proxytype', 'proxyuser', 'proxypassword',
-        'proxybypass', 'theme', 'pathtogs', 'pathtoclam', 'pathtodu', 'aspellpath', 'pathtodot'
+        'proxybypass', 'theme', 'pathtogs', 'pathtoclam', 'pathtodu', 'aspellpath', 'pathtodot', 'skiplangupgrade'
     ));
 
     // Add extra allowed settings.