diff --git a/src/openzeppelin/access/ownable/ownable.cairo b/src/openzeppelin/access/ownable/ownable.cairo
index 1027d4ca7..29e21dde0 100644
--- a/src/openzeppelin/access/ownable/ownable.cairo
+++ b/src/openzeppelin/access/ownable/ownable.cairo
@@ -71,9 +71,8 @@ mod Ownable {
     // Internals
 
     #[internal]
-    fn initializer() {
-        let caller: ContractAddress = get_caller_address();
-        _transfer_ownership(caller);
+    fn initializer(owner: ContractAddress) {
+        _transfer_ownership(owner);
     }
 
     #[internal]
diff --git a/src/openzeppelin/tests/access/test_dual_ownable.cairo b/src/openzeppelin/tests/access/test_dual_ownable.cairo
index c093838fc..87841fe8d 100644
--- a/src/openzeppelin/tests/access/test_dual_ownable.cairo
+++ b/src/openzeppelin/tests/access/test_dual_ownable.cairo
@@ -17,6 +17,7 @@ use openzeppelin::tests::mocks::dual_ownable_mocks::SnakeOwnablePanicMock;
 use openzeppelin::tests::mocks::dual_ownable_mocks::CamelOwnablePanicMock;
 use openzeppelin::tests::mocks::non_implementing_mock::NonImplementingMock;
 use openzeppelin::tests::utils;
+use openzeppelin::utils::serde::SerializedAppend;
 
 //
 // Constants
@@ -36,14 +37,14 @@ fn NEW_OWNER() -> ContractAddress {
 
 fn setup_snake() -> (DualCaseOwnable, IOwnableDispatcher) {
     let mut calldata = ArrayTrait::new();
-    set_caller_address(OWNER());
+    calldata.append_serde(OWNER());
     let target = utils::deploy(SnakeOwnableMock::TEST_CLASS_HASH, calldata);
     (DualCaseOwnable { contract_address: target }, IOwnableDispatcher { contract_address: target })
 }
 
 fn setup_camel() -> (DualCaseOwnable, IOwnableCamelDispatcher) {
     let mut calldata = ArrayTrait::new();
-    set_caller_address(OWNER());
+    calldata.append_serde(OWNER());
     let target = utils::deploy(CamelOwnableMock::TEST_CLASS_HASH, calldata);
     (
         DualCaseOwnable {
@@ -56,13 +57,11 @@ fn setup_camel() -> (DualCaseOwnable, IOwnableCamelDispatcher) {
 
 fn setup_non_ownable() -> DualCaseOwnable {
     let calldata = ArrayTrait::new();
-    set_caller_address(OWNER());
     let target = utils::deploy(NonImplementingMock::TEST_CLASS_HASH, calldata);
     DualCaseOwnable { contract_address: target }
 }
 
 fn setup_ownable_panic() -> (DualCaseOwnable, DualCaseOwnable) {
-    set_caller_address(OWNER());
     let snake_target = utils::deploy(SnakeOwnablePanicMock::TEST_CLASS_HASH, ArrayTrait::new());
     let camel_target = utils::deploy(CamelOwnablePanicMock::TEST_CLASS_HASH, ArrayTrait::new());
     (
diff --git a/src/openzeppelin/tests/access/test_ownable.cairo b/src/openzeppelin/tests/access/test_ownable.cairo
index 7f3980699..a3a4f0af9 100644
--- a/src/openzeppelin/tests/access/test_ownable.cairo
+++ b/src/openzeppelin/tests/access/test_ownable.cairo
@@ -19,7 +19,7 @@ fn OTHER() -> ContractAddress {
 
 fn setup() {
     testing::set_caller_address(OWNER());
-    Ownable::initializer();
+    Ownable::initializer(OWNER());
 }
 
 //
diff --git a/src/openzeppelin/tests/mocks/dual_ownable_mocks.cairo b/src/openzeppelin/tests/mocks/dual_ownable_mocks.cairo
index f84bc195e..407d63e3b 100644
--- a/src/openzeppelin/tests/mocks/dual_ownable_mocks.cairo
+++ b/src/openzeppelin/tests/mocks/dual_ownable_mocks.cairo
@@ -4,8 +4,8 @@ mod SnakeOwnableMock {
     use openzeppelin::access::ownable::Ownable;
 
     #[constructor]
-    fn constructor() {
-        Ownable::initializer();
+    fn constructor(owner: ContractAddress) {
+        Ownable::initializer(owner);
     }
 
     #[view]
@@ -30,8 +30,8 @@ mod CamelOwnableMock {
     use openzeppelin::access::ownable::Ownable;
 
     #[constructor]
-    fn constructor() {
-        Ownable::initializer();
+    fn constructor(owner: ContractAddress) {
+        Ownable::initializer(owner);
     }
 
     #[view]