diff --git a/tests/phpunit/CRM/Case/Form/CustomDataTest.php b/tests/phpunit/CRM/Case/Form/CustomDataTest.php
index 1e276558ef38..1385d139ddf6 100644
--- a/tests/phpunit/CRM/Case/Form/CustomDataTest.php
+++ b/tests/phpunit/CRM/Case/Form/CustomDataTest.php
@@ -334,7 +334,7 @@ private function convertCurrency(string $input): string {
    * Test that when custom case data is edited but not changed that it doesn't
    * create a meaningless empty activity.
    */
-  public function testCustomDataNoChangeNoActivity() {
+  public function testCustomDataNoChangeNoActivity(): void {
     // Create a custom group and field
     $customField = $this->callAPISuccess('custom_field', 'create', [
       'custom_group_id' => $this->custom_group['id'],
@@ -362,6 +362,7 @@ public function testCustomDataNoChangeNoActivity() {
     // this is case type
     $form->set('subType', 1);
     $form->set('cid', $individual);
+    $form->buildForm();
     ob_start();
     $form->controller->_actions['display']->perform($form, 'display');
     ob_end_clean();
diff --git a/tests/phpunit/CRM/Custom/Form/OptionTest.php b/tests/phpunit/CRM/Custom/Form/OptionTest.php
index 385dda5bcb27..8117fa05498e 100644
--- a/tests/phpunit/CRM/Custom/Form/OptionTest.php
+++ b/tests/phpunit/CRM/Custom/Form/OptionTest.php
@@ -9,7 +9,7 @@ class CRM_Custom_Form_OptionTest extends CiviUnitTestCase {
   /**
    * Test the `name` field doesn't get changed when editing an existing option.
    */
-  public function testEditCustomFieldOptionValue() {
+  public function testEditCustomFieldOptionValue(): void {
     // Create a custom field for contacts with some option choices
     $customGroup = $this->customGroupCreate(['extends' => 'Contact', 'title' => 'contact stuff']);
     $customField = $this->customFieldOptionValueCreate($customGroup, 'myCustomField');
@@ -28,6 +28,7 @@ public function testEditCustomFieldOptionValue() {
     $form->set('id', $optionValue['id']);
     $form->set('fid', $customField['id']);
     $form->set('gid', $customGroup['id']);
+    $form->buildForm();
 
     ob_start();
     $form->controller->_actions['display']->perform($form, 'display');