diff --git a/payment/uc_credit/src/Tests/CreditCardTest.php b/payment/uc_credit/src/Tests/CreditCardTest.php
index 84b460f..4e786a6 100644
--- a/payment/uc_credit/src/Tests/CreditCardTest.php
+++ b/payment/uc_credit/src/Tests/CreditCardTest.php
@@ -58,7 +58,10 @@ class CreditCardTest extends UbercartTestBase {
   public static $modules = array('uc_payment', 'uc_credit', 'test_gateway');
   public static $adminPermissions = array('administer credit cards', 'process credit cards');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Need admin permissions in order to change credit card settings.
@@ -109,9 +112,9 @@ class CreditCardTest extends UbercartTestBase {
   }
 
   /**
-   * Implements WebTestBase::tearDown().
+   * {@inheritdoc}
    */
-  public function tearDown() {
+  protected function tearDown() {
     // Cleanup keys directory after test.
     \Drupal::service('file_system')->unlink('sites/default/files/simpletest.keys/' . UC_CREDIT_KEYFILE_NAME);
     \Drupal::service('file_system')->rmdir('sites/default/files/simpletest.keys');
diff --git a/payment/uc_payment/src/Tests/PaymentPaneTest.php b/payment/uc_payment/src/Tests/PaymentPaneTest.php
index 3098118..b8c65ec 100644
--- a/payment/uc_payment/src/Tests/PaymentPaneTest.php
+++ b/payment/uc_payment/src/Tests/PaymentPaneTest.php
@@ -18,7 +18,10 @@ class PaymentPaneTest extends UbercartTestBase {
 
   public static $modules = array('uc_payment', 'uc_payment_pack');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);
     $this->addToCart($this->product);
diff --git a/payment/uc_payment_pack/src/Tests/PaymentPackTest.php b/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
index cb74d01..63a7843 100644
--- a/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
+++ b/payment/uc_payment_pack/src/Tests/PaymentPackTest.php
@@ -20,7 +20,10 @@ class PaymentPackTest extends UbercartTestBase {
 
   public static $modules = array('uc_payment', 'uc_payment_pack');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Log in and add a product to the cart for testing.
diff --git a/shipping/uc_quote/src/Tests/QuoteTest.php b/shipping/uc_quote/src/Tests/QuoteTest.php
index 5c52f92..51af72c 100644
--- a/shipping/uc_quote/src/Tests/QuoteTest.php
+++ b/shipping/uc_quote/src/Tests/QuoteTest.php
@@ -21,7 +21,10 @@ class QuoteTest extends UbercartTestBase {
   public static $modules = array(/*'rules_admin', */'uc_payment', 'uc_payment_pack', 'uc_quote', 'uc_flatrate');
   public static $adminPermissions = array('configure quotes'/*, 'administer rules', 'bypass rules access'*/);
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);
     $this->createPaymentMethod('check');
diff --git a/uc_attribute/src/Tests/AttributeTest.php b/uc_attribute/src/Tests/AttributeTest.php
index a633f53..44b6cd4 100644
--- a/uc_attribute/src/Tests/AttributeTest.php
+++ b/uc_attribute/src/Tests/AttributeTest.php
@@ -19,7 +19,10 @@ class AttributeTest extends UbercartTestBase {
   public static $modules = array('uc_attribute');
   public static $adminPermissions = array('administer attributes', 'administer product attributes', 'administer product options');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Need page_title_block because we test page titles
diff --git a/uc_cart/src/Tests/CartBlockTest.php b/uc_cart/src/Tests/CartBlockTest.php
index f471cf9..637a3a5 100644
--- a/uc_cart/src/Tests/CartBlockTest.php
+++ b/uc_cart/src/Tests/CartBlockTest.php
@@ -23,7 +23,10 @@ class CartBlockTest extends UbercartTestBase {
    */
   protected $block;
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
     $this->block = $this->drupalPlaceBlock('uc_cart');
   }
diff --git a/uc_cart/src/Tests/CartCheckoutTest.php b/uc_cart/src/Tests/CartCheckoutTest.php
index 2dc8498..548b658 100644
--- a/uc_cart/src/Tests/CartCheckoutTest.php
+++ b/uc_cart/src/Tests/CartCheckoutTest.php
@@ -40,8 +40,10 @@ class CartCheckoutTest extends UbercartTestBase {
    */
   protected $cart;
 
-
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Create a simple customer user account.
diff --git a/uc_cart/src/Tests/CartSettingsTest.php b/uc_cart/src/Tests/CartSettingsTest.php
index 838625a..5c40efc 100644
--- a/uc_cart/src/Tests/CartSettingsTest.php
+++ b/uc_cart/src/Tests/CartSettingsTest.php
@@ -19,7 +19,10 @@ class CartSettingsTest extends UbercartTestBase {
 
   public static $modules = array('uc_cart', 'block');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
     $this->drupalPlaceBlock('system_breadcrumb_block');
   }
diff --git a/uc_cart_links/src/Tests/CartLinksTest.php b/uc_cart_links/src/Tests/CartLinksTest.php
index 59686bb..b08f658 100644
--- a/uc_cart_links/src/Tests/CartLinksTest.php
+++ b/uc_cart_links/src/Tests/CartLinksTest.php
@@ -22,7 +22,10 @@ class CartLinksTest extends UbercartTestBase {
   public static $modules = array('uc_cart_links', 'uc_attribute', 'help', 'block');
   public static $adminPermissions = array('administer cart links', 'view cart links report', 'access administration pages');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Set front page so we have someplace to redirect to for invalid Cart Links.
diff --git a/uc_order/src/Tests/CustomerAdminTest.php b/uc_order/src/Tests/CustomerAdminTest.php
index 6260dfa..7becc4f 100644
--- a/uc_order/src/Tests/CustomerAdminTest.php
+++ b/uc_order/src/Tests/CustomerAdminTest.php
@@ -39,6 +39,9 @@ class CustomerAdminTest extends UbercartTestBase {
    */
   public static $modules = array('views');
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/uc_order/src/Tests/OrderTest.php b/uc_order/src/Tests/OrderTest.php
index b3fddc5..dd200f4 100644
--- a/uc_order/src/Tests/OrderTest.php
+++ b/uc_order/src/Tests/OrderTest.php
@@ -23,7 +23,10 @@ class OrderTest extends UbercartTestBase {
   /** Authenticated but unprivileged user. */
   protected $customer;
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Need page_title_block because we test page titles
diff --git a/uc_product/src/Tests/ProductTest.php b/uc_product/src/Tests/ProductTest.php
index 51ae7c7..3aa06f8 100644
--- a/uc_product/src/Tests/ProductTest.php
+++ b/uc_product/src/Tests/ProductTest.php
@@ -19,7 +19,10 @@ class ProductTest extends UbercartTestBase {
   public static $modules = array('path', 'uc_product');
   public static $adminPermissions = array('administer content types');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);
   }
diff --git a/uc_product_kit/src/Tests/ProductKitTest.php b/uc_product_kit/src/Tests/ProductKitTest.php
index 65fd2cb..1510b91 100644
--- a/uc_product_kit/src/Tests/ProductKitTest.php
+++ b/uc_product_kit/src/Tests/ProductKitTest.php
@@ -19,7 +19,10 @@ class ProductKitTest extends UbercartTestBase {
   public static $modules = array('uc_product_kit');
   public static $adminPermissions = array('create product_kit content', 'edit any product_kit content');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Need page_title_block because we test page titles
diff --git a/uc_role/src/Tests/RoleCheckoutTest.php b/uc_role/src/Tests/RoleCheckoutTest.php
index dd4456c..2c6209a 100644
--- a/uc_role/src/Tests/RoleCheckoutTest.php
+++ b/uc_role/src/Tests/RoleCheckoutTest.php
@@ -23,7 +23,10 @@ class RoleCheckoutTest extends UbercartTestBase {
   /** Authenticated but unprivileged user. */
   protected $customer;
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Create a simple customer user account.
diff --git a/uc_stock/src/Tests/StockTest.php b/uc_stock/src/Tests/StockTest.php
index a88d64b..f346eac 100644
--- a/uc_stock/src/Tests/StockTest.php
+++ b/uc_stock/src/Tests/StockTest.php
@@ -19,7 +19,10 @@ class StockTest extends UbercartTestBase {
   public static $modules = array('uc_stock');
   public static $adminPermissions = array('administer product stock');
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Need page_title_block because we test page titles
diff --git a/uc_store/src/Tests/AddressTest.php b/uc_store/src/Tests/AddressTest.php
index 8fe6a0a..0a2316c 100644
--- a/uc_store/src/Tests/AddressTest.php
+++ b/uc_store/src/Tests/AddressTest.php
@@ -19,7 +19,10 @@ class AddressTest extends UbercartTestBase {
   /** Array of Address objects */
   protected $test_address = array();
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
 
     // Create a random address object for use in tests.
diff --git a/uc_store/src/Tests/AjaxTest.php b/uc_store/src/Tests/AjaxTest.php
index 54168d4..eb929a6 100644
--- a/uc_store/src/Tests/AjaxTest.php
+++ b/uc_store/src/Tests/AjaxTest.php
@@ -19,7 +19,10 @@ class AjaxTest extends UbercartTestBase {
   public static $modules = array(/*'rules_admin', */'uc_payment', 'uc_payment_pack');
   public static $adminPermissions = array(/*'administer rules', 'bypass rules access'*/);
 
-  public function setUp() {
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
     parent::setUp();
     $this->drupalLogin($this->adminUser);