diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index 3bc9405e934edc6729f8f8d4a5548c6f3ff2baf8..18b3c58e34f91e1581de2f7d9f283b62ccad35eb 100644
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -376,7 +376,7 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
         $countryDomain = '';
       }
 
-      $invoiceNotes = Civi::settings()->get('invoice_notes') ?? NULL;
+      $invoiceNotes = Civi::settings()->get('invoice_notes');
 
       // parameters to be assign for template
       $tplParams = [
diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php
index d9c4a2e4c9ca173fcb20b3b2b119a24ff1998597..e47ba65973c341be8287029da2d90a1d8b3728bb 100644
--- a/CRM/Core/Payment/Form.php
+++ b/CRM/Core/Payment/Form.php
@@ -209,7 +209,7 @@ class CRM_Core_Payment_Form {
    */
   public static function buildPaymentForm(&$form, $processor, $billing_profile_id, $isBackOffice, $paymentInstrumentID = NULL) {
     //if the form has address fields assign to the template so the js can decide what billing fields to show
-    $form->assign('profileAddressFields', $form->get('profileAddressFields') ?? NULL);
+    $form->assign('profileAddressFields', $form->get('profileAddressFields'));
     $form->addExpectedSmartyVariable('suppressSubmitButton');
     if (!empty($processor['object']) && $processor['object']->buildForm($form)) {
       return;
diff --git a/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php b/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php
index 7979155e4fcb49669df66b16b6f3eee9dfe01281..61407cab5b367acacc5f55bf67500bdba3707d23 100644
--- a/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php
+++ b/ext/oauth-client/tests/phpunit/api/v4/OAuthSessionTokenTest.php
@@ -25,7 +25,7 @@ class api_v4_OAuthSessionTokenTest extends \PHPUnit\Framework\TestCase implement
   public function setUp(): void {
     parent::setUp();
     $this->assertEquals(0, CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_oauth_client'));
-    $this->assertNull(CRM_Core_Session::singleton()->get('OAuthSessionTokens') ?? NULL);
+    $this->assertNull(CRM_Core_Session::singleton()->get('OAuthSessionTokens'));
   }
 
   protected function tearDown(): void {