diff -u b/core/modules/comment/tests/src/Functional/Update/CommentAdminViewUpdateTest.php b/core/modules/comment/tests/src/Functional/Update/CommentAdminViewUpdateTest.php
--- b/core/modules/comment/tests/src/Functional/Update/CommentAdminViewUpdateTest.php
+++ b/core/modules/comment/tests/src/Functional/Update/CommentAdminViewUpdateTest.php
@@ -38,8 +38,7 @@
     /** @var \Drupal\views\ViewEntityInterface $comment_admin_view */
     $comment_admin_view = $entity_type_manager->getStorage('view')->load('comment');
     $this->assertNotNull($comment_admin_view, 'Comment admin view exist in storage.');
-    // FIXME: Is this correct?
-    $this->assertNotEmpty($comment_admin_view->enable(), 'Comment admin view is enabled.');
+    $this->assertTrue((bool) $comment_admin_view->enable()->get('status'), 'Comment admin view is enabled.');
     $comment_delete_action = $entity_type_manager->getStorage('action')->load('comment_delete_action');
     $this->assertNotNull($comment_delete_action, 'Comment delete action imported');
     // Verify comment admin page is working after updates.
diff -u b/core/modules/dblog/tests/src/Functional/DbLogTest.php b/core/modules/dblog/tests/src/Functional/DbLogTest.php
--- b/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -158,8 +158,7 @@
     // Test disabling of detailed cron logging.
     $this->config('system.cron')->set('logging', 0)->save();
     $cron_count = $this->runCron();
-    // FIXME: Is this correct?
-    $this->assertNotEmpty($cron_count = 1, format_string('Cron added @count of @expected new log entries', ['@count' => $cron_count, '@expected' => 1]));
+    $this->assertTrue($cron_count == 1, format_string('Cron added @count of @expected new log entries', ['@count' => $cron_count, '@expected' => 1]));
   }
 
   /**