diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 515cdd2e8f..a832cade0b 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -182,7 +182,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
 
     $form['value'] = [
       '#title' => $this->options['limit'] ? $this->formatPlural(count($vocabularies), 'Select terms from vocabulary @vocabs', 'Select terms from vocabularies @vocabs', [
-        '@vocabs' => "'" . implode("', '", $this->getVocabularyLabels($vocabularies))  . "'",
+        '@vocabs' => "'" . implode("', '", $this->getVocabularyLabels($vocabularies)) . "'",
       ]) : $this->t('Select terms'),
     ];
 
diff --git a/core/modules/taxonomy/taxonomy.post_update.php b/core/modules/taxonomy/taxonomy.post_update.php
index a82e4d8348..beaa5395a4 100644
--- a/core/modules/taxonomy/taxonomy.post_update.php
+++ b/core/modules/taxonomy/taxonomy.post_update.php
@@ -367,7 +367,6 @@ function taxonomy_post_update_configure_status_field_widget(&$sandbox = NULL) {
   });
 }
 
-
 /**
  * Allow multiple vocabularies for views using the taxonomy term ID filter.
  */
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
index 85f88d630f..7731097d12 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
@@ -102,22 +102,19 @@ protected function createVocabularyAndTerms($vocab_id) {
     // term 2.0
     // - term 2.1
     // - term 2.2
+    $terms = [];
     for ($i = 0; $i < 3; $i++) {
       for ($j = 0; $j <= $i; $j++) {
-        $this->terms[$i][$j] = $term = Term::create([
-          'vid' => 'tags',
+        $term = Term::create([
+          'vid' => $vocab_id,
           'name' => "Term $i.$j",
           'parent' => isset($this->terms[$i][0]) ? $this->terms[$i][0]->id() : 0,
         ]);
         $term->save();
+        $terms[$i][$j] = $term;
       }
     }
-    ViewTestData::createTestViews(get_class($this), ['taxonomy_test_views']);
-
-    Vocabulary::create([
-      'vid' => 'empty_vocabulary',
-      'name' => 'Empty Vocabulary',
-    ])->save();
+    return $terms;
   }
 
   /**