diff --git a/modules/salesforce_mapping/tests/src/Unit/MappedObjectTest.php b/modules/salesforce_mapping/tests/src/Unit/MappedObjectTest.php
index 5987fe6eaec577b37cfa4c197ad3a112d1c5a7cb..6ceca2244ab057b80e6c1485322f32dde2df0215 100644
--- a/modules/salesforce_mapping/tests/src/Unit/MappedObjectTest.php
+++ b/modules/salesforce_mapping/tests/src/Unit/MappedObjectTest.php
@@ -7,6 +7,7 @@ use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\salesforce\Exception;
 use Drupal\salesforce_mapping\Entity\MappedObject;
 use Drupal\salesforce_mapping\Entity\SalesforceMappingInterface;
 use Drupal\salesforce\Rest\RestClientInterface;
@@ -260,7 +261,6 @@ class MappedObjectTest extends UnitTestCase {
 
   /**
    * @covers ::pull
-   * @expectedException \Drupal\salesforce\Exception
    */
   public function testPullException() {
     $this->mapped_object->expects($this->any())
@@ -269,7 +269,7 @@ class MappedObjectTest extends UnitTestCase {
     $this->mapping->expects($this->any())
       ->method('hasKey')
       ->willReturn(FALSE);
-
+    $this->expectException(Exception::class);
     $this->mapped_object->pull();
   }
 
diff --git a/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php b/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php
index 6b49503dabf77752fcac0757199deeb6a295a72e..5c1947a5ca74c542bbad43eb2b3d85f8c6d951d3 100644
--- a/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php
+++ b/modules/salesforce_mapping_ui/src/Tests/SalesforceMappingCrudFormTest.php
@@ -46,7 +46,7 @@ class SalesforceMappingCrudFormTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  protected function setUp() {
     parent::setUp();
 
     // Admin salesforce user.
diff --git a/modules/salesforce_push/tests/src/Unit/PushQueueTest.php b/modules/salesforce_push/tests/src/Unit/PushQueueTest.php
index 6e15c49388276efb5ce4936b88da0ae9141dd20b..7e66ab94c57d368624847c89f940bc6b96256627 100644
--- a/modules/salesforce_push/tests/src/Unit/PushQueueTest.php
+++ b/modules/salesforce_push/tests/src/Unit/PushQueueTest.php
@@ -104,11 +104,10 @@ class PushQueueTest extends UnitTestCase {
 
   /**
    * @covers ::claimItem
-   *
-   * @expectedException \Exception
    */
   public function testClaimItem() {
     $this->queue = PushQueue::create(\Drupal::getContainer());
+    $this->expectException(\Exception::class);
     $this->queue->claimItem();
   }
 
diff --git a/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php b/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php
index 73781042e27110a1bf01776947dc942467629d46..2a1688604a78e83bfed0132aed2f5a95bd07e4ff 100644
--- a/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php
+++ b/modules/salesforce_push/tests/src/Unit/SalesforcePushQueueProcessorRestTest.php
@@ -6,6 +6,8 @@ use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
+use Drupal\Core\Queue\SuspendQueueException;
+use Drupal\salesforce\EntityNotFoundException;
 use Drupal\salesforce\SalesforceAuthProviderPluginManager;
 use Drupal\Tests\UnitTestCase;
 use Drupal\salesforce\Rest\RestClientInterface;
@@ -99,7 +101,6 @@ class SalesforcePushQueueProcessorRestTest extends UnitTestCase {
 
   /**
    * @covers ::process
-   * @expectedException \Drupal\Core\Queue\SuspendQueueException
    */
   public function testProcessMissingAuth() {
     $this->authMan =
@@ -123,6 +124,7 @@ class SalesforcePushQueueProcessorRestTest extends UnitTestCase {
       ])
       ->getMock();
 
+    $this->expectException(SuspendQueueException::class);
     $this->handler->process([(object) [1]]);
   }
 
@@ -284,8 +286,6 @@ class SalesforcePushQueueProcessorRestTest extends UnitTestCase {
 
   /**
    * @covers ::processItem
-   *
-   * @expectedException \Drupal\salesforce\EntityNotFoundException
    */
   public function testProcessItemEntityNotFound() {
     // Test throwing exception on drupal entity not found.
@@ -331,6 +331,7 @@ class SalesforcePushQueueProcessorRestTest extends UnitTestCase {
       ->method('getMappedObject')
       ->willReturn($this->mappedObject);
 
+    $this->expectException(EntityNotFoundException::class);
     $this->handler->processItem($this->queueItem);
   }
 
diff --git a/tests/src/Unit/RestClientTest.php b/tests/src/Unit/RestClientTest.php
index 1033cd0d24182b5c5070753bb7faf994d508a4a1..e7991ced4cfef006b2bfbb5741798b7a849292aa 100644
--- a/tests/src/Unit/RestClientTest.php
+++ b/tests/src/Unit/RestClientTest.php
@@ -135,7 +135,6 @@ class RestClientTest extends UnitTestCase {
 
   /**
    * @covers ::apiCall
-   * @expectedException Exception
    */
   public function testExceptionApiCall() {
     $this->initClient();
@@ -147,6 +146,7 @@ class RestClientTest extends UnitTestCase {
       ->method('httpRequest')
       ->willReturn($response);
 
+    $this->expectException(\Exception::class);
     $this->client->apiCall('');
   }
 
@@ -240,8 +240,6 @@ class RestClientTest extends UnitTestCase {
 
   /**
    * @covers ::objectDescribe
-   *
-   * @expectedException Exception
    */
   public function testObjectDescribe() {
     $this->initClient(array_merge($this->methods, ['apiCall']));
@@ -291,6 +289,7 @@ class RestClientTest extends UnitTestCase {
     // @TODO what happens when we provide a name for non-existent SF table?
     // 404 exception?
     // Test that we throw an exception if name is not provided.
+    $this->expectException(\Exception::class);
     $this->client->objectDescribe('');
   }
 
@@ -401,8 +400,6 @@ class RestClientTest extends UnitTestCase {
 
   /**
    * @covers ::objectDelete
-   *
-   * @expectedException \GuzzleHttp\Exception\RequestException
    */
   public function testObjectDelete() {
     $this->initClient(array_merge($this->methods, [
@@ -433,6 +430,7 @@ class RestClientTest extends UnitTestCase {
 
     $this->assertNull($this->client->objectDelete('', ''));
     $this->assertNull($this->client->objectDelete('', ''));
+    $this->expectException(RequestException::class);
     $this->client->objectDelete('', '');
   }
 
diff --git a/tests/src/Unit/SFIDTest.php b/tests/src/Unit/SFIDTest.php
index e2b4e4301b7247f3141d3d024eef901b7b1825f0..4e61faf81842e451b024f642fef92c0009e2c54b 100644
--- a/tests/src/Unit/SFIDTest.php
+++ b/tests/src/Unit/SFIDTest.php
@@ -29,10 +29,9 @@ class SFIDTest extends UnitTestCase {
 
   /**
    * Test object instantiation with bad ID.
-   *
-   * @expectedException \Exception
    */
   public function testBadId() {
+    $this->expectException(\Exception::class);
     new SFID('1234567890');
   }
 
diff --git a/tests/src/Unit/SObjectTest.php b/tests/src/Unit/SObjectTest.php
index 21bea951670b583c646410c74270344d354cfdc1..bcfada90be6f9a171f6c8cb3c73c6753177233db 100644
--- a/tests/src/Unit/SObjectTest.php
+++ b/tests/src/Unit/SObjectTest.php
@@ -30,28 +30,25 @@ class SObjectTest extends UnitTestCase {
 
   /**
    * Test object instantiation wth no ID.
-   *
-   * @expectedException \Exception
    */
   public function testObjectNoId() {
+    $this->expectException(\Exception::class);
     new SObject(['attributes' => ['type' => 'dummy']]);
   }
 
   /**
    * Test object instantiation with bad ID.
-   *
-   * @expectedException \Exception
    */
   public function testObjectBadId() {
+    $this->expectException(\Exception::class);
     new SObject(['id' => '1234567890', 'attributes' => ['type' => 'dummy']]);
   }
 
   /**
    * Test object instantiation with no type.
-   *
-   * @expectedException \Exception
    */
   public function testObjectNoType() {
+    $this->expectException(\Exception::class);
     new SObject(['id' => '1234567890abcde']);
   }