diff --git a/eth2near/contract_wrapper/Cargo.toml b/eth2near/contract_wrapper/Cargo.toml
index 94c985d1..1396fa18 100644
--- a/eth2near/contract_wrapper/Cargo.toml
+++ b/eth2near/contract_wrapper/Cargo.toml
@@ -18,8 +18,11 @@ serde_json = "1.0.74"
 serde = { version = "1.0", features = ["derive"] }
 eth-types = { path = "../../contracts/near/eth-types/" }
 eth2-utility = { path = "../../contracts/near/eth2-utility/" }
+workspaces = { version = "0.7", optional = true }
 
 [dev-dependencies]
-workspaces = "0.7"
 futures = "0.3.21"
 anyhow = "1.0"
+
+[features]
+sandbox = ["workspaces"]
diff --git a/eth2near/contract_wrapper/src/lib.rs b/eth2near/contract_wrapper/src/lib.rs
index 6ef3fb64..edec0a0a 100644
--- a/eth2near/contract_wrapper/src/lib.rs
+++ b/eth2near/contract_wrapper/src/lib.rs
@@ -10,6 +10,6 @@ pub mod file_eth_client_contract;
 pub mod near_contract_wrapper;
 pub mod near_network;
 pub mod near_rpc_client;
-#[cfg(test)]
+#[cfg(feature = "sandbox")]
 pub mod sandbox_contract_wrapper;
 pub mod utils;
diff --git a/eth2near/eth2-contract-init/Cargo.toml b/eth2near/eth2-contract-init/Cargo.toml
index 39cb0625..bdbd133f 100644
--- a/eth2near/eth2-contract-init/Cargo.toml
+++ b/eth2near/eth2-contract-init/Cargo.toml
@@ -6,11 +6,11 @@ edition = "2021"
 [dependencies]
 tree_hash = { git = "https://github.com/aurora-is-near/lighthouse.git", tag = "v3.5.1-wasm" }
 merkle_proof = { git = "https://github.com/aurora-is-near/lighthouse.git", tag = "v3.5.1-wasm" }
-types =  { git = "https://github.com/aurora-is-near/lighthouse.git", tag = "v3.5.1-wasm" }
-eth2_to_near_relay = { path = "../eth2near-block-relay-rs"}
+types = { git = "https://github.com/aurora-is-near/lighthouse.git", tag = "v3.5.1-wasm" }
+eth2_to_near_relay = { path = "../eth2near-block-relay-rs" }
 eth_rpc_client = { path = "../eth_rpc_client" }
 eth-types = { path = "../../contracts/near/eth-types/" }
-eth2-utility  = { path = "../../contracts/near/eth2-utility" }
+eth2-utility = { path = "../../contracts/near/eth2-utility" }
 contract_wrapper = { path = "../contract_wrapper" }
 log = { version = "0.4", features = ["std", "serde"] }
 clap = { version = "3.1.6", features = ["derive"] }
@@ -26,3 +26,4 @@ dotenv = "0.15.0"
 [dev-dependencies]
 workspaces = "0.7"
 tokio = { version = "1.1", features = ["macros", "rt", "time"] }
+contract_wrapper = { path = "../contract_wrapper", features = ["sandbox"] }
diff --git a/eth2near/eth2near-block-relay-rs/Cargo.toml b/eth2near/eth2near-block-relay-rs/Cargo.toml
index ae70a2a1..c25bde4e 100644
--- a/eth2near/eth2near-block-relay-rs/Cargo.toml
+++ b/eth2near/eth2near-block-relay-rs/Cargo.toml
@@ -50,3 +50,4 @@ dotenv = "0.15.0"
 [dev-dependencies]
 workspaces = "0.7"
 eth2-contract-init = { path = "../eth2-contract-init" }
+contract_wrapper = { path = "../contract_wrapper", features = ["sandbox"] }