diff --git a/config/sync/ultimate_cron.job.node_revision_delete_cron.yml b/config/sync/ultimate_cron.job.node_revision_delete_cron.yml
deleted file mode 100644
index 3389ff348..000000000
--- a/config/sync/ultimate_cron.job.node_revision_delete_cron.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: c4004a13-4474-4317-b03e-2ce357501e87
-langcode: en
-status: true
-dependencies:
-  module:
-    - node_revision_delete
-title: 'Default cron handler'
-id: node_revision_delete_cron
-weight: 0
-module: node_revision_delete
-callback: node_revision_delete_cron
-scheduler:
-  id: simple
-  configuration:
-    rules:
-      - '* * * * *'
-launcher:
-  id: serial
-logger:
-  id: database
diff --git a/tests/codeception/acceptance/AuthenticatedPermissionsCest.php b/tests/codeception/acceptance/AuthenticatedPermissionsCest.php
index 66f598bb8..731902066 100644
--- a/tests/codeception/acceptance/AuthenticatedPermissionsCest.php
+++ b/tests/codeception/acceptance/AuthenticatedPermissionsCest.php
@@ -80,12 +80,8 @@ public function testAuthenticatedUserRestrictions(AcceptanceTester $I) {
    */
   public function testSiteManagerEscalationSelf(AcceptanceTester $I) {
     $site_manager = $I->logInWithRole('site_manager');
-    $site_manager_id = $site_manager->id();
-    $I->amOnPage('/admin/users');
-    $I->canSee($site_manager->getDisplayName());
-    $I->click(['link' => $site_manager->getDisplayName()]);
-    $I->click('.roles.tabs__tab a');
-    $I->canSeeInCurrentUrl("/user/$site_manager_id/roles");
+    $I->amOnPage($site_manager->toUrl('edit-form')->toString());
+
     $I->dontSee('Administrator');
     $I->dontSee('Site Builder');
     $I->dontSee('Site Developer');
diff --git a/tests/codeception/acceptance/Content/NewsCest.php b/tests/codeception/acceptance/Content/NewsCest.php
index e0d8f05da..d3803f757 100644
--- a/tests/codeception/acceptance/Content/NewsCest.php
+++ b/tests/codeception/acceptance/Content/NewsCest.php
@@ -126,9 +126,8 @@ public function testXMLMetaDataRevisions(AcceptanceTester $I) {
 
     // Revision Delete is enabled.
     $I->amOnPage('/admin/structure/types/manage/stanford_news');
-    $I->seeCheckboxIsChecked("#edit-node-revision-delete-track");
-    $I->seeCheckboxIsChecked("#edit-options-revision");
-    $I->seeInField("#edit-minimum-revisions-to-keep", 5);
+    $I->seeCheckboxIsChecked("#edit-amount-status");
+    $I->seeInField("Minimum number of revisions to keep (per language)", 5);
 
     // XML Sitemap.
     $I->amOnPage("/admin/config/search/xmlsitemap/settings");
diff --git a/tests/codeception/acceptance/Contrib/NodeRevisionDeleteCest.php b/tests/codeception/acceptance/Contrib/NodeRevisionDeleteCest.php
index 52f43aeaa..cf35ae76d 100644
--- a/tests/codeception/acceptance/Contrib/NodeRevisionDeleteCest.php
+++ b/tests/codeception/acceptance/Contrib/NodeRevisionDeleteCest.php
@@ -44,7 +44,7 @@ public function testNodeRevisionDelete(AcceptanceTester $I) {
     $I->amOnPage("/node/{$node->id()}/revisions");
     $I->canSeeNumberOfElements('.diff-revisions tbody tr', 11);
 
-    $I->runDrush('cron:run node_revision_delete_cron --force');
+    $I->runDrush('queue:run node_revision_delete');
     $I->amOnPage("/node/{$node->id()}/revisions");
     $I->canSeeNumberOfElements('.diff-revisions tbody tr', 5);
   }