core/drupalci.yml                                  | 10 ++--
 .../src/FunctionalJavascript/SourceEditingTest.php | 58 ++++++++++++++++++++--
 core/package.json                                  |  2 +-
 3 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/core/drupalci.yml b/core/drupalci.yml
index 94aa2ad22f..6b4e9a767b 100644
--- a/core/drupalci.yml
+++ b/core/drupalci.yml
@@ -15,30 +15,30 @@ build:
       # deprecated code.
       run_tests.phpunit:
         types: 'PHPUnit-Unit'
-        testgroups: '--all'
+        testgroups: '--module ckeditor5'
         suppress-deprecations: false
         halt-on-fail: false
       run_tests.kernel:
         types: 'PHPUnit-Kernel'
-        testgroups: '--all'
+        testgroups: '--module ckeditor5'
         suppress-deprecations: false
         halt-on-fail: false
       run_tests.build:
         # Limit concurrency due to disk space concerns.
         concurrency: 15
         types: 'PHPUnit-Build'
-        testgroups: '--all'
+        testgroups: '--module ckeditor5'
         suppress-deprecations: false
         halt-on-fail: false
       run_tests.functional:
         types: 'PHPUnit-Functional'
-        testgroups: '--all'
+        testgroups: '--module ckeditor5'
         suppress-deprecations: false
         halt-on-fail: false
       run_tests.javascript:
         concurrency: 15
         types: 'PHPUnit-FunctionalJavascript'
-        testgroups: '--all'
+        testgroups: '--module ckeditor5'
         suppress-deprecations: false
         halt-on-fail: false
       # Run nightwatch testing.
diff --git a/core/modules/ckeditor5/tests/src/FunctionalJavascript/SourceEditingTest.php b/core/modules/ckeditor5/tests/src/FunctionalJavascript/SourceEditingTest.php
index c6f9b6716d..83c8087d60 100644
--- a/core/modules/ckeditor5/tests/src/FunctionalJavascript/SourceEditingTest.php
+++ b/core/modules/ckeditor5/tests/src/FunctionalJavascript/SourceEditingTest.php
@@ -62,7 +62,7 @@ protected function setUp(): void {
         'filter_html' => [
           'status' => TRUE,
           'settings' => [
-            'allowed_html' => '<div class> <p> <br> <a href>',
+            'allowed_html' => '<div class> <p> <br> <a href> <ol> <ul> <li>',
           ],
         ],
         'filter_align' => ['status' => TRUE],
@@ -77,6 +77,8 @@ protected function setUp(): void {
           'items' => [
             'sourceEditing',
             'link',
+            'bulletedList',
+            'numberedList',
           ],
         ],
         'plugins' => [
@@ -108,7 +110,7 @@ function (ConstraintViolation $v) {
       'type' => 'page',
       'title' => 'Animals with strange names',
       'body' => [
-        'value' => '<div class="llama" data-llama="🦙"><p data-llama="🦙">The <a href="https://example.com/pirate" class="button" data-grammar="subject">pirate</a> is <a href="https://example.com/irate" class="use-ajax" data-grammar="adjective">irate</a>.</p></div>',
+        'value' => '',
         'format' => 'test_format',
       ],
     ]);
@@ -168,7 +170,10 @@ public function testSourceEditingSettingsForm() {
    *
    * @dataProvider providerAllowingExtraAttributes
    */
-  public function testAllowingExtraAttributes(string $expected_markup, ?string $allowed_elements_string = NULL) {
+  public function testAllowingExtraAttributes(string $original_markup, string $expected_markup, ?string $allowed_elements_string = NULL) {
+    $this->host->body->value = $original_markup;
+    $this->host->save();
+
     if ($allowed_elements_string) {
       // Allow creating additional HTML using SourceEditing.
       $text_editor = Editor::load('test_format');
@@ -213,35 +218,43 @@ function (ConstraintViolation $v) {
    *   The test cases.
    */
   public function providerAllowingExtraAttributes(): array {
+    $general_test_case_markup = '<div class="llama" data-llama="🦙"><p data-llama="🦙">The <a href="https://example.com/pirate" class="button" data-grammar="subject">pirate</a> is <a href="https://example.com/irate" class="use-ajax" data-grammar="adjective">irate</a>.</p></div>';
     return [
       'no extra attributes allowed' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate">pirate</a> is <a href="https://example.com/irate">irate</a>.</p></div>',
       ],
 
       // Common case: any attribute that is not `style` or `class`.
       '<a data-grammar="subject">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate" data-grammar="subject">pirate</a> is <a href="https://example.com/irate">irate</a>.</p></div>',
         '<a data-grammar="subject">',
       ],
       '<a data-grammar="adjective">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate">pirate</a> is <a href="https://example.com/irate" data-grammar="adjective">irate</a>.</p></div>',
         '<a data-grammar="adjective">',
       ],
       '<a data-grammar>' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate" data-grammar="subject">pirate</a> is <a href="https://example.com/irate" data-grammar="adjective">irate</a>.</p></div>',
         '<a data-grammar>',
       ],
 
       // Edge case: `class`.
       '<a class="button">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a class="button" href="https://example.com/pirate">pirate</a> is <a href="https://example.com/irate">irate</a>.</p></div>',
         '<a class="button">',
       ],
       '<a class="use-ajax">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate">pirate</a> is <a class="use-ajax" href="https://example.com/irate">irate</a>.</p></div>',
         '<a class="use-ajax">',
       ],
       '<a class>' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a class="button" href="https://example.com/pirate">pirate</a> is <a class="use-ajax" href="https://example.com/irate">irate</a>.</p></div>',
         '<a class>',
       ],
@@ -249,12 +262,14 @@ public function providerAllowingExtraAttributes(): array {
       // Edge case: $text-container wildcard with additional
       // attribute.
       '<$text-container data-llama>' => [
+        $general_test_case_markup,
         '<div class="llama" data-llama="🦙"><p data-llama="🦙">The <a href="https://example.com/pirate">pirate</a> is <a href="https://example.com/irate">irate</a>.</p></div>',
         '<$text-container data-llama>',
       ],
       // Edge case: $text-container wildcard with stricter attribute
       // constrain.
       '<$text-container class="not-llama">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate">pirate</a> is <a href="https://example.com/irate">irate</a>.</p></div>',
         '<$text-container class="not-llama">',
       ],
@@ -264,38 +279,75 @@ public function providerAllowingExtraAttributes(): array {
       // - infix, f.e. `*gramma*`
       // - suffix, f.e. `*-grammar`
       '<a data-*>' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate" data-grammar="subject">pirate</a> is <a href="https://example.com/irate" data-grammar="adjective">irate</a>.</p></div>',
         '<a data-*>',
       ],
       '<a *gramma*>' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate" data-grammar="subject">pirate</a> is <a href="https://example.com/irate" data-grammar="adjective">irate</a>.</p></div>',
         '<a *gramma*>',
       ],
       '<a *-grammar>' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate" data-grammar="subject">pirate</a> is <a href="https://example.com/irate" data-grammar="adjective">irate</a>.</p></div>',
         '<a *-grammar>',
       ],
 
       // Edge case: concrete attribute with wildcard class value.
       '<a class="use-*">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate">pirate</a> is <a class="use-ajax" href="https://example.com/irate">irate</a>.</p></div>',
         '<a class="use-*">',
       ],
 
       // Edge case: concrete attribute with wildcard attribute value.
       '<a data-grammar="sub*">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate" data-grammar="subject">pirate</a> is <a href="https://example.com/irate">irate</a>.</p></div>',
         '<a data-grammar="sub*">',
       ],
 
       // Edge case: `data-*` with wildcard attribute value.
       '<a data-*="sub*">' => [
+        $general_test_case_markup,
         '<div class="llama"><p>The <a href="https://example.com/pirate" data-grammar="subject">pirate</a> is <a href="https://example.com/irate">irate</a>.</p></div>',
         '<a data-*="sub*">',
       ],
 
       // Edge case: `style`.
       // @todo https://www.drupal.org/project/drupal/issues/3260857
+
+      // Edge case: `type` attribute on lists.
+      // @todo Remove in https://www.drupal.org/project/drupal/issues/3274635.
+      'no numberedList-related additions to the Source Editing configuration' => [
+        '<ol type="A"><li>foo</li><li>bar</li></ol>',
+        '<ol><li>foo</li><li>bar</li></ol>',
+      ],
+      '<ol type>' => [
+        '<ol type="A"><li>foo</li><li>bar</li></ol>',
+        '<ol type="A"><li>foo</li><li>bar</li></ol>',
+        '<ol type>',
+      ],
+      '<ol type="A">' => [
+        '<ol type="A"><li>foo</li><li>bar</li></ol>',
+        '<ol type="A"><li>foo</li><li>bar</li></ol>',
+        '<ol type="A">',
+      ],
+      'no bulletedList-related additions to the Source Editing configuration' => [
+        '<ul type="circle"><li>foo</li><li>bar</li></ul>',
+        '<ul><li>foo</li><li>bar</li></ul>',
+      ],
+      '<ul type>' => [
+        '<ul type="circle"><li>foo</li><li>bar</li></ul>',
+        '<ul type="circle"><li>foo</li><li>bar</li></ul>',
+        '<ul type>',
+      ],
+      '<ul type="circle">' => [
+        '<ul type="circle"><li>foo</li><li>bar</li></ul>',
+        '<ul type="circle"><li>foo</li><li>bar</li></ul>',
+        '<ul type="circle">',
+      ],
     ];
   }
 
diff --git a/core/package.json b/core/package.json
index 9f2cca7c99..8cb26fdcdc 100644
--- a/core/package.json
+++ b/core/package.json
@@ -22,7 +22,7 @@
     "lint:css": "stylelint \"**/*.css\"",
     "lint:css-checkstyle": "stylelint \"**/*.css\" --custom-formatter ./node_modules/stylelint-checkstyle-formatter/index.js",
     "lint:yaml": "node ./node_modules/eslint/bin/eslint.js --ext .yml .",
-    "test:nightwatch": "cross-env BABEL_ENV=development node -r dotenv-safe/config -r @babel/register ./node_modules/.bin/nightwatch --config ./tests/Drupal/Nightwatch/nightwatch.conf.js",
+    "test:nightwatch": "cross-env BABEL_ENV=development node -r dotenv-safe/config -r @babel/register ./node_modules/.bin/nightwatch --config ./tests/Drupal/Nightwatch/nightwatch.conf.js --tag ckeditor5",
     "prettier": "prettier --write \"./**/*.es6.js\" \"./tests/Drupal/Nightwatch/**/*.js\" \"./modules/ckeditor5/js/ckeditor5_plugins/**/*.js\"",
     "spellcheck": "cspell",
     "spellcheck:make-drupal-dict": "rm -f misc/cspell/dictionary.txt && touch misc/cspell/dictionary.txt && yarn -s spellcheck:core --unique --wordsOnly | tr '[:upper:]' '[:lower:]' | tr -d \\\\\\\\ | LC_ALL=C sort -u -o misc/cspell/dictionary.txt",