diff --git a/tests/src/Unit/Plugin/Field/FieldWidget/PrimaryEntityReferenceOptionsButtonsWidgetTest.php b/tests/src/Unit/Plugin/Field/FieldWidget/PrimaryEntityReferenceOptionsButtonsWidgetTest.php
index 838992a..017fd5d 100644
--- a/tests/src/Unit/Plugin/Field/FieldWidget/PrimaryEntityReferenceOptionsButtonsWidgetTest.php
+++ b/tests/src/Unit/Plugin/Field/FieldWidget/PrimaryEntityReferenceOptionsButtonsWidgetTest.php
@@ -63,12 +63,10 @@ class PrimaryEntityReferenceOptionsButtonsWidgetTest extends UnitTestCase {
 
     // Set the column property used by parent massageFormValues.
     $columnProperty = $reflection->getProperty('column');
-    $columnProperty->setAccessible(TRUE);
     $columnProperty->setValue($widget, 'target_id');
 
     // Set the settings property to avoid getSetting() errors.
     $settingsProperty = $reflection->getParentClass()->getProperty('settings');
-    $settingsProperty->setAccessible(TRUE);
     $settingsProperty->setValue($widget, [
       'primary_label'     => 'Primary',
       'show_primary_only' => FALSE,
@@ -221,7 +219,6 @@ class PrimaryEntityReferenceOptionsButtonsWidgetTest extends UnitTestCase {
     // We need to use reflection to call settingsForm since widget is mocked.
     $reflection = new \ReflectionClass($widget);
     $method = $reflection->getMethod('settingsForm');
-    $method->setAccessible(TRUE);
 
     $element = $method->invoke($widget, $form, $form_state);
 
@@ -242,14 +239,12 @@ class PrimaryEntityReferenceOptionsButtonsWidgetTest extends UnitTestCase {
     // Set show_primary_only to TRUE via reflection.
     $reflection = new \ReflectionClass($widget);
     $settingsProperty = $reflection->getParentClass()->getProperty('settings');
-    $settingsProperty->setAccessible(TRUE);
     $settingsProperty->setValue($widget, [
       'primary_label'     => 'Primary',
       'show_primary_only' => TRUE,
     ]);
 
     $method = $reflection->getMethod('settingsSummary');
-    $method->setAccessible(TRUE);
 
     $summary = $method->invoke($widget);
 
@@ -282,12 +277,10 @@ class PrimaryEntityReferenceOptionsButtonsWidgetTest extends UnitTestCase {
     // Set required properties.
     $reflection = new \ReflectionClass($widget);
     $columnProperty = $reflection->getProperty('column');
-    $columnProperty->setAccessible(TRUE);
     $columnProperty->setValue($widget, 'target_id');
 
     // Set fieldDefinition property.
     $fieldDefinitionProperty = $reflection->getProperty('fieldDefinition');
-    $fieldDefinitionProperty->setAccessible(TRUE);
 
     $field_definition = $this->createMock('Drupal\Core\Field\FieldDefinitionInterface');
     $field_definition->expects($this->any())
@@ -297,7 +290,6 @@ class PrimaryEntityReferenceOptionsButtonsWidgetTest extends UnitTestCase {
 
     // Set settings to enable show_primary_only.
     $settingsProperty = $reflection->getParentClass()->getProperty('settings');
-    $settingsProperty->setAccessible(TRUE);
     $settingsProperty->setValue($widget, [
       'primary_label'     => 'Primary',
       'show_primary_only' => TRUE,
diff --git a/tests/src/Unit/Plugin/Field/PrimaryEntityReferenceFieldItemListTest.php b/tests/src/Unit/Plugin/Field/PrimaryEntityReferenceFieldItemListTest.php
index f49b662..e4e93f4 100644
--- a/tests/src/Unit/Plugin/Field/PrimaryEntityReferenceFieldItemListTest.php
+++ b/tests/src/Unit/Plugin/Field/PrimaryEntityReferenceFieldItemListTest.php
@@ -69,7 +69,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item]);
 
     // Call the real __get method by using a real instance with the list set.
@@ -133,7 +132,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item1, $item2, $item3]);
 
     $result = $itemList->primary();
@@ -175,7 +173,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item1, $item2]);
 
     $result = $itemList->primary();
@@ -199,7 +196,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, []);
 
     $result = $itemList->primary();
@@ -266,7 +262,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item1, $item2, $item3]);
 
     // Call preSave.
@@ -320,7 +315,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item1, $item2]);
 
     // Call preSave.
@@ -380,7 +374,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item1, $item2]);
 
     // Call preSave.
@@ -440,7 +433,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item1, $item2]);
 
     // Call preSave.
@@ -515,7 +507,6 @@ class PrimaryEntityReferenceFieldItemListTest extends UnitTestCase {
     // Use reflection to set the protected list property.
     $reflection = new \ReflectionClass(PrimaryEntityReferenceFieldItemList::class);
     $listProperty = $reflection->getProperty('list');
-    $listProperty->setAccessible(TRUE);
     $listProperty->setValue($itemList, [$item1, $item2, $item3]);
 
     // Call preSave.