diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index 8f2c46fe50c..85c69ab6ada 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -391,7 +391,7 @@ Feature: Perform basic calendar functionality
     And I click on "type change test event" "link"
     Then I should see "Course event"
     # Reset to user event
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "type change test event" "dialogue"
     And I set the following fields to these values:
       | Event title   | type change test event |
       | Type of event | User                   |
@@ -414,7 +414,7 @@ Feature: Perform basic calendar functionality
     And I click on "type change test event" "link"
     And I should see "Group event"
     # Reset to user event
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "type change test event" "dialogue"
     And I set the following fields to these values:
       | Event title | type change test event |
       | Type of event | User |
@@ -422,7 +422,7 @@ Feature: Perform basic calendar functionality
     And I click on "type change test event" "link"
     And I should see "User event"
     # Now test changing from user to course event.
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "type change test event" "dialogue"
     And I set the following fields to these values:
       | Event title   | Course 1 event |
       | Type of event | Course         |
@@ -432,7 +432,7 @@ Feature: Perform basic calendar functionality
     And I click on "Course 1 event" "link"
     And I should see "Course event"
     # Reset to user event
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "Course 1 event" "dialogue"
     And I set the following fields to these values:
       | Event title   | type change test event |
       | Type of event | User                   |
@@ -440,7 +440,7 @@ Feature: Perform basic calendar functionality
     And I click on "type change test event" "link"
     And I should see "User event"
     # Now test changing from user to category event.
-    And I click on "Edit" "button"
+    And I click on "Edit" "button" in the "type change test event" "dialogue"
     And I set the following fields to these values:
       | Event title   | type change test event |
       | Type of event | Category               |
diff --git a/lib/db/install.php b/lib/db/install.php
index 153d3b0b199..a6841848db2 100644
--- a/lib/db/install.php
+++ b/lib/db/install.php
@@ -129,7 +129,7 @@ function xmldb_main_install() {
         'sessiontimeout'        => 8 * 60 * 60, // Must be present during roles installation.
         'stringfilters'         => '', // These two are managed in a strange way by the filters.
         'filterall'             => 0, // setting page, so have to be initialised here.
-        'texteditors'           => 'atto,tinymce,textarea',
+        'texteditors'           => 'tiny,atto,tinymce,textarea',
         'antiviruses'           => '',
         'media_plugins_sortorder' => 'videojs,youtube',
         'upgrade_extracreditweightsstepignored' => 1, // New installs should not run this upgrade step.
diff --git a/lib/editor/atto/db/install.php b/lib/editor/atto/db/install.php
deleted file mode 100644
index ad890400d96..00000000000
--- a/lib/editor/atto/db/install.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Atto upgrade script.
- *
- * @package    editor_atto
- * @copyright  2014 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Make the Atto the default editor for upgrades from 26.
- *
- * @return bool
- */
-function xmldb_editor_atto_install() {
-    global $CFG;
-
-    // Make Atto the default.
-    $currenteditors = $CFG->texteditors;
-    $neweditors = array();
-
-    $list = explode(',', $currenteditors);
-    array_push($neweditors, 'atto');
-    foreach ($list as $editor) {
-        if ($editor != 'atto') {
-            array_push($neweditors, $editor);
-        }
-    }
-
-    set_config('texteditors', implode(',', $neweditors));
-
-    return true;
-}
diff --git a/lib/editor/tiny/db/install.php b/lib/editor/tiny/db/install.php
index fe0fb6ca9a6..7e348774278 100644
--- a/lib/editor/tiny/db/install.php
+++ b/lib/editor/tiny/db/install.php
@@ -23,9 +23,9 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
- /**
-  * Post installation procedure for the TinyMCE editor.
-  */
+/**
+ * Enable the TinyMCE Editor on its install.
+ */
 function xmldb_editor_tiny_install(): void {
     $editormanager = \core_plugin_manager::resolve_plugininfo_class('editor');
     $editormanager::enable_plugin('tiny', true);
diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index 1413fe48662..0857e2427db 100644
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -185,6 +185,7 @@ class data_field_textarea extends data_field_base {
         $str .= '<input type="hidden" name="'.$field.'_itemid" value="'.s($draftitemid).'" />';
         $str .= '<div class="mod-data-input">';
         $str .= '<div><textarea id="'.$field.'" name="'.$field.'" rows="'.$this->field->param3.'" class="form-control" ' .
+            'data-fieldtype="editor" ' .
             'cols="'.$this->field->param2.'" spellcheck="true">'.s($text).'</textarea></div>';
         $str .= '<div><label class="accesshide" for="' . $field . '_content1">' . get_string('format') . '</label>';
         $str .= '<select id="' . $field . '_content1" name="'.$field.'_content1">';
diff --git a/mod/data/tests/behat/actionsmenu_replacement.feature b/mod/data/tests/behat/actionsmenu_replacement.feature
index 42cf84389e7..ac21c986a4b 100644
--- a/mod/data/tests/behat/actionsmenu_replacement.feature
+++ b/mod/data/tests/behat/actionsmenu_replacement.feature
@@ -37,6 +37,7 @@ Feature: Users can add the ##actionsmenu## replacement to the database templates
     And I am on the "Test database name" "data activity" page logged in as teacher1
     And I navigate to "Templates" in current page administration
     And I set the field "Templates tertiary navigation" to "List view template"
+    And I set the field "Enable code editor" to "0"
     And I set the following fields to these values:
       | Header         | <table>                                              |
       | Repeated entry | <tr><td>[[field1]]</td><td>##actionsmenu##</td><tr>  |
diff --git a/mod/quiz/report/grading/tests/behat/grading.feature b/mod/quiz/report/grading/tests/behat/grading.feature
index fc496eb60b8..f636e6c3ad0 100644
--- a/mod/quiz/report/grading/tests/behat/grading.feature
+++ b/mod/quiz/report/grading/tests/behat/grading.feature
@@ -166,7 +166,7 @@ Feature: Basic use of the Manual grading report
     And I should see "Separate groups: All participants"
     Then I should see "Sorry, but you need to be part of a group to see this page."
 
-  @javascript
+  @javascript @editor_atto
   Scenario: Manual grading report with attempts to be graded
     Given the following "questions" exist:
       | questioncategory | qtype | name     | user  | questiontext    |
diff --git a/repository/contentbank/tests/behat/select_content.feature b/repository/contentbank/tests/behat/select_content.feature
index 355f119e3ce..c484e056235 100644
--- a/repository/contentbank/tests/behat/select_content.feature
+++ b/repository/contentbank/tests/behat/select_content.feature
@@ -137,6 +137,7 @@ Feature: Select content bank files using the content bank files repository
     When I click on "Browse repositories..." "button"
     Then I should not see "Content bank" in the ".fp-repo-area" "css_element"
 
+  @editor_atto
   Scenario: Student can not see the content bank repository
     Given I am on the Forum "Forum activity" page logged in as student
     And I click on "Add discussion topic" "link"