diff --git a/programs/bpf_loader/src/lib.rs b/programs/bpf_loader/src/lib.rs
index b925c7c784..815cd103fb 100644
--- a/programs/bpf_loader/src/lib.rs
+++ b/programs/bpf_loader/src/lib.rs
@@ -1596,7 +1596,7 @@ mod tests {
         assert_eq!(None, bank.get_account(&buffer_address));
         let post_program_account = bank.get_account(&program_keypair.pubkey()).unwrap();
         assert_eq!(post_program_account.lamports, min_program_balance);
-        assert_eq!(post_program_account.owner, bpf_loader_upgradeable::id());
+        assert_eq!(post_program_account.owner(), &bpf_loader_upgradeable::id());
         assert_eq!(
             post_program_account.data().len(),
             UpgradeableLoaderState::program_len().unwrap()
diff --git a/programs/bpf_loader/src/serialization.rs b/programs/bpf_loader/src/serialization.rs
index beaa41e1a5..804fed5bd9 100644
--- a/programs/bpf_loader/src/serialization.rs
+++ b/programs/bpf_loader/src/serialization.rs
@@ -422,7 +422,7 @@ mod tests {
             let account = account.borrow();
             assert_eq!(account.lamports, account_info.lamports());
             assert_eq!(account.data(), &account_info.data.borrow()[..]);
-            assert_eq!(&account.owner, account_info.owner);
+            assert_eq!(account.owner(), account_info.owner);
             assert_eq!(account.executable, account_info.executable);
             assert_eq!(account.rent_epoch, account_info.rent_epoch);
 
@@ -470,7 +470,7 @@ mod tests {
                 account.data(),
                 de_keyed_account.try_account_ref().unwrap().data()
             );
-            assert_eq!(account.owner, de_keyed_account.owner().unwrap());
+            assert_eq!(*account.owner(), de_keyed_account.owner().unwrap());
             assert_eq!(account.executable, de_keyed_account.executable().unwrap());
             assert_eq!(account.rent_epoch, de_keyed_account.rent_epoch().unwrap());
         }
@@ -494,7 +494,7 @@ mod tests {
             let account = account.borrow();
             assert_eq!(account.lamports, account_info.lamports());
             assert_eq!(account.data(), &account_info.data.borrow()[..]);
-            assert_eq!(&account.owner, account_info.owner);
+            assert_eq!(account.owner(), account_info.owner);
             assert_eq!(account.executable, account_info.executable);
             assert_eq!(account.rent_epoch, account_info.rent_epoch);
         }
@@ -529,7 +529,7 @@ mod tests {
                 account.data(),
                 de_keyed_account.try_account_ref().unwrap().data()
             );
-            assert_eq!(account.owner, de_keyed_account.owner().unwrap());
+            assert_eq!(*account.owner(), de_keyed_account.owner().unwrap());
             assert_eq!(account.executable, de_keyed_account.executable().unwrap());
             assert_eq!(account.rent_epoch, de_keyed_account.rent_epoch().unwrap());
         }
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 1b0baf8255..1625cf73ba 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -8979,12 +8979,12 @@ pub(crate) mod tests {
         // Post-processing filter
         let indexed_accounts = bank
             .get_filtered_indexed_accounts(&IndexKey::ProgramId(program_id), |account| {
-                account.owner == program_id
+                account.owner() == &program_id
             });
         assert!(indexed_accounts.is_empty());
         let indexed_accounts = bank
             .get_filtered_indexed_accounts(&IndexKey::ProgramId(another_program_id), |account| {
-                account.owner == another_program_id
+                account.owner() == &another_program_id
             });
         assert_eq!(indexed_accounts.len(), 1);
         assert_eq!(indexed_accounts[0], (address, new_account));
@@ -10885,7 +10885,7 @@ pub(crate) mod tests {
             bank.get_balance(&inline_spl_token_v2_0::native_mint::id()),
             4200000000
         );
-        assert_eq!(native_mint_account.owner, inline_spl_token_v2_0::id());
+        assert_eq!(native_mint_account.owner(), &inline_spl_token_v2_0::id());
 
         // MainnetBeta - Native mint blinks into existence at epoch 75
         genesis_config.cluster_type = ClusterType::MainnetBeta;
diff --git a/runtime/src/system_instruction_processor.rs b/runtime/src/system_instruction_processor.rs
index e102555471..fdaaec4f1c 100644
--- a/runtime/src/system_instruction_processor.rs
+++ b/runtime/src/system_instruction_processor.rs
@@ -571,7 +571,7 @@ mod tests {
         );
         assert_eq!(from_account.borrow().lamports, 50);
         assert_eq!(to_account.borrow().lamports, 50);
-        assert_eq!(to_account.borrow().owner, new_owner);
+        assert_eq!(to_account.borrow().owner(), &new_owner);
         assert_eq!(to_account.borrow().data(), &[0, 0]);
     }
 
@@ -608,7 +608,7 @@ mod tests {
         );
         assert_eq!(from_account.borrow().lamports, 50);
         assert_eq!(to_account.borrow().lamports, 50);
-        assert_eq!(to_account.borrow().owner, new_owner);
+        assert_eq!(to_account.borrow().owner(), &new_owner);
         assert_eq!(to_account.borrow().data(), &[0, 0]);
     }