diff --git a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
index d7c6d9f..2773509 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php
@@ -190,7 +190,7 @@ function testExistingFormat() {
     $this->drupalGet('admin/config/content/formats/manage/filtered_html');
     $ultra_llama_mode_checkbox = $this->xpath('//input[@type="checkbox" and @name="editor[settings][plugins][llama_contextual_and_button][ultra_llama_mode]" and @checked="checked"]');
     $this->assertTrue(count($ultra_llama_mode_checkbox) === 1, 'The "Ultra llama mode" checkbox exists and is checked.');
-    $expected_settings['plugins']['llama_contextual_and_button']['ultra_llama_mode'] = 1;
+    $expected_settings['plugins']['llama_contextual_and_button']['ultra_llama_mode'] = TRUE;
     $editor = entity_load('editor', 'filtered_html');
     $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists.');
     $this->assertIdentical($expected_settings, $editor->getSettings());
diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
index 23cd3c2..e8cf014 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
@@ -135,7 +135,7 @@ function testLoading() {
     $this->resetAll();
     $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions();
     $editor_settings = $editor->getSettings();
-    $editor_settings['toolbar']['buttons'][0][] = 'Llama';
+    $editor_settings['toolbar']['rows'][0][0]['items'][] = 'Llama';
     $editor->setSettings($editor_settings);
     $editor->save();
     $this->drupalGet('node/add/article');
diff --git a/core/modules/ckeditor/tests/modules/config/schema/ckeditor_test.schema.yml b/core/modules/ckeditor/tests/modules/config/schema/ckeditor_test.schema.yml
new file mode 100644
index 0000000..e6734a7
--- /dev/null
+++ b/core/modules/ckeditor/tests/modules/config/schema/ckeditor_test.schema.yml
@@ -0,0 +1,7 @@
+ckeditor.plugin.llama_contextual_and_button:
+  type: mapping
+  label: 'Contextual Llama With Button'
+  mapping:
+    ultra_llama_mode:
+      type: boolean
+      label: 'Ultra llama mode'
diff --git a/core/modules/search/src/Tests/SearchTokenizerTest.php b/core/modules/search/src/Tests/SearchTokenizerTest.php
index 23338e3..b3361a9 100644
--- a/core/modules/search/src/Tests/SearchTokenizerTest.php
+++ b/core/modules/search/src/Tests/SearchTokenizerTest.php
@@ -121,7 +121,7 @@ function testNoTokenizer() {
     // sure CJK tokenizing is turned on.
     \Drupal::config('search.settings')
       ->set('index.minimum_word_size', 1)
-      ->set('overlap_cjk', TRUE)
+      ->set('index.overlap_cjk', TRUE)
       ->save();
     $this->refreshVariables();