diff --git a/tests/src/Functional/XmlSitemapFunctionalTest.php b/tests/src/Functional/XmlSitemapFunctionalTest.php
index ea54f0e..85789ba 100644
--- a/tests/src/Functional/XmlSitemapFunctionalTest.php
+++ b/tests/src/Functional/XmlSitemapFunctionalTest.php
@@ -33,8 +33,8 @@ class XmlSitemapFunctionalTest extends XmlSitemapTestBase {
     $this->regenerateSitemap();
     $this->drupalGetSitemap();
     $this->assertSession()->statusCodeEquals(200);
-    $etag = $this->drupalGetHeader('etag');
-    $last_modified = $this->drupalGetHeader('last-modified');
+    $etag = $this->getSession()->getResponseHeader('etag');
+    $last_modified = $this->getSession()->getResponseHeader('last-modified');
     $this->assertNotEmpty($etag, t('Etag header found.'));
     $this->assertNotEmpty($last_modified, t('Last-modified header found.'));
 
diff --git a/tests/src/Functional/XmlSitemapTaxonomyFunctionalTest.php b/tests/src/Functional/XmlSitemapTaxonomyFunctionalTest.php
index edd7f9b..5621b3d 100644
--- a/tests/src/Functional/XmlSitemapTaxonomyFunctionalTest.php
+++ b/tests/src/Functional/XmlSitemapTaxonomyFunctionalTest.php
@@ -64,7 +64,8 @@ class XmlSitemapTaxonomyFunctionalTest extends XmlSitemapTestBase {
     ];
     $this->submitForm($edit, t('Save'));
 
-    $term = taxonomy_term_load_multiple_by_name($term_name, 'tags')[1];
+    $term = Drupal::entityTypeManager()->getStorage('taxonomy_term')->lo
+                    adByProperties(['name' => $term_name, 'vid' => 'tags'])[1];
     $link = $this->linkStorage->load('taxonomy_term', $term->id());
     $this->assertEquals(1, (int) $link['status']);
     $this->assertEquals(1, (int) $link['priority']);