diff --git a/.travis.yml b/.travis.yml
index 314b087..c4adf8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,29 +24,28 @@ jobs:
     - php: 7.3
       env:
         - DRUPAL_CORE=9.0.x
+        # --- Remaining direct deprecation notices (4)
         # 4 inheritEnvironmentVariables
         - DEPRECATIONS=4
     - php: 7.4
       env:
         - DRUPAL_CORE=9.1.x
-        # --- Remaining self deprecation notices (31)
-        # 26 setUp without a void return
+        # --- Remaining self deprecation notices (5)
         # 5  setUp without a void return (in Rules module)
 
         # --- Remaining direct deprecation notices (110)
         # 4 inheritEnvironmentVariables
         # 106 EventDispatcher (in Rules module)
-        - DEPRECATIONS=141
+        - DEPRECATIONS=115
     - php: 7.4
       env:
         # Have a second 9.1 run which does not execute the Rules tests.
         - DRUPAL_CORE=9.1.x
-        # --- Remaining self deprecation notices (26)
-        # 26 setUp without a void return
+        # --- Remaining self deprecation notices (0)
 
         # --- Remaining direct deprecation notices (4)
         # 4 inheritEnvironmentVariables
-        - DEPRECATIONS=30
+        - DEPRECATIONS=4
         - RULES=NO
 
 # Be sure to cache composer downloads.
diff --git a/tests/src/Functional/SchedulerApiTest.php b/tests/src/Functional/SchedulerApiTest.php
index 4a82751..c2812cf 100644
--- a/tests/src/Functional/SchedulerApiTest.php
+++ b/tests/src/Functional/SchedulerApiTest.php
@@ -25,7 +25,7 @@ class SchedulerApiTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Load the custom node type. It will be enabled for Scheduler automatically
diff --git a/tests/src/Functional/SchedulerBrowserTestBase.php b/tests/src/Functional/SchedulerBrowserTestBase.php
index fc4cf2f..0a84666 100644
--- a/tests/src/Functional/SchedulerBrowserTestBase.php
+++ b/tests/src/Functional/SchedulerBrowserTestBase.php
@@ -36,7 +36,7 @@ abstract class SchedulerBrowserTestBase extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->schedulerSetUp();
diff --git a/tests/src/Functional/SchedulerDevelGenerateTest.php b/tests/src/Functional/SchedulerDevelGenerateTest.php
index 0b95f76..b483441 100644
--- a/tests/src/Functional/SchedulerDevelGenerateTest.php
+++ b/tests/src/Functional/SchedulerDevelGenerateTest.php
@@ -23,7 +23,7 @@ class SchedulerDevelGenerateTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Create a user with devel permission. Only 'administer devel_generate' is
diff --git a/tests/src/Functional/SchedulerFieldsDisplayTest.php b/tests/src/Functional/SchedulerFieldsDisplayTest.php
index ff6deca..f1e9e31 100644
--- a/tests/src/Functional/SchedulerFieldsDisplayTest.php
+++ b/tests/src/Functional/SchedulerFieldsDisplayTest.php
@@ -19,7 +19,7 @@ class SchedulerFieldsDisplayTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Create a custom user with admin permissions but also permission to use
diff --git a/tests/src/Functional/SchedulerLightweightCronTest.php b/tests/src/Functional/SchedulerLightweightCronTest.php
index 4c78282..a182fd4 100644
--- a/tests/src/Functional/SchedulerLightweightCronTest.php
+++ b/tests/src/Functional/SchedulerLightweightCronTest.php
@@ -14,7 +14,7 @@ class SchedulerLightweightCronTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->routeCronForm = Url::fromRoute('scheduler.cron_form');
diff --git a/tests/src/Functional/SchedulerMultilingualTest.php b/tests/src/Functional/SchedulerMultilingualTest.php
index 0776927..79bd226 100644
--- a/tests/src/Functional/SchedulerMultilingualTest.php
+++ b/tests/src/Functional/SchedulerMultilingualTest.php
@@ -35,7 +35,7 @@ class SchedulerMultilingualTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Create a user with the required translation permissions.
diff --git a/tests/src/Functional/SchedulerNodeAccessTest.php b/tests/src/Functional/SchedulerNodeAccessTest.php
index 517540c..a7a9a5f 100644
--- a/tests/src/Functional/SchedulerNodeAccessTest.php
+++ b/tests/src/Functional/SchedulerNodeAccessTest.php
@@ -20,20 +20,14 @@ class SchedulerNodeAccessTest extends SchedulerBrowserTestBase {
   protected static $modules = ['scheduler_access_test'];
 
   /**
-   * {@inheritdoc}
+   * Tests Scheduler cron functionality when access to the nodes is denied.
    */
-  public function setUp() {
-    parent::setUp();
+  public function testNodeAccess() {
+
     // scheduler_access_test_install() sets node_access_needs_rebuild(TRUE) and
     // this works when testing the module interactively, but during simpletest
     // the node access table is not rebuilt. Hence do that here explicitly here.
     node_access_rebuild();
-  }
-
-  /**
-   * Tests Scheduler cron functionality when access to the nodes is denied.
-   */
-  public function testNodeAccess() {
 
     // Create data to test publishing then unpublishing via loop.
     // @TODO Convert this test to use a @dataProvider function instead of this
diff --git a/tests/src/Functional/SchedulerRulesActionsTest.php b/tests/src/Functional/SchedulerRulesActionsTest.php
index 2f510af..40e3323 100644
--- a/tests/src/Functional/SchedulerRulesActionsTest.php
+++ b/tests/src/Functional/SchedulerRulesActionsTest.php
@@ -22,7 +22,7 @@ class SchedulerRulesActionsTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
diff --git a/tests/src/Functional/SchedulerRulesConditionsTest.php b/tests/src/Functional/SchedulerRulesConditionsTest.php
index eb9f75b..972d958 100644
--- a/tests/src/Functional/SchedulerRulesConditionsTest.php
+++ b/tests/src/Functional/SchedulerRulesConditionsTest.php
@@ -21,7 +21,7 @@ class SchedulerRulesConditionsTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
diff --git a/tests/src/Functional/SchedulerRulesEventsTest.php b/tests/src/Functional/SchedulerRulesEventsTest.php
index c3804be..cb4af8c 100644
--- a/tests/src/Functional/SchedulerRulesEventsTest.php
+++ b/tests/src/Functional/SchedulerRulesEventsTest.php
@@ -23,7 +23,7 @@ class SchedulerRulesEventsTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->rulesStorage = $this->container->get('entity_type.manager')->getStorage('rules_reaction_rule');
diff --git a/tests/src/Functional/SchedulerScheduledContentListAccessTest.php b/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
index dd95bbd..33fd887 100644
--- a/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
+++ b/tests/src/Functional/SchedulerScheduledContentListAccessTest.php
@@ -19,7 +19,7 @@ class SchedulerScheduledContentListAccessTest extends SchedulerBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $base_permissions = [
diff --git a/tests/src/FunctionalJavascript/SchedulerJavascriptDefaultTimeTest.php b/tests/src/FunctionalJavascript/SchedulerJavascriptDefaultTimeTest.php
index 865e46e..b68c919 100644
--- a/tests/src/FunctionalJavascript/SchedulerJavascriptDefaultTimeTest.php
+++ b/tests/src/FunctionalJavascript/SchedulerJavascriptDefaultTimeTest.php
@@ -19,7 +19,7 @@ class SchedulerJavascriptDefaultTimeTest extends SchedulerJavascriptTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Determine whether the HTML5 date picker is expecting d/m/Y or m/d/Y
diff --git a/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php b/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php
index facb9f9..0e92de9 100644
--- a/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php
+++ b/tests/src/FunctionalJavascript/SchedulerJavascriptTestBase.php
@@ -38,7 +38,7 @@ abstract class SchedulerJavascriptTestBase extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     // Call the common set-up function defined in the trait.
     $this->schedulerSetUp();