diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index 11cc3b315e..83f706a945 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -1418,7 +1418,6 @@ version = "1.2.9"
 dependencies = [
  "solana-bpf-rust-128bit-dep 1.2.9",
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1426,7 +1425,6 @@ name = "solana-bpf-rust-128bit-dep"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1434,7 +1432,6 @@ name = "solana-bpf-rust-alloc"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1443,7 +1440,6 @@ version = "1.2.9"
 dependencies = [
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1451,7 +1447,6 @@ name = "solana-bpf-rust-dup-accounts"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1461,7 +1456,6 @@ dependencies = [
  "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
  "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1470,7 +1464,6 @@ name = "solana-bpf-rust-external-spend"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1479,7 +1472,6 @@ version = "1.2.9"
 dependencies = [
  "solana-bpf-rust-invoked 1.2.9",
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1487,7 +1479,6 @@ name = "solana-bpf-rust-invoked"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1495,7 +1486,6 @@ name = "solana-bpf-rust-iter"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1504,7 +1494,6 @@ version = "1.2.9"
 dependencies = [
  "solana-bpf-rust-many-args-dep 1.2.9",
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1512,7 +1501,6 @@ name = "solana-bpf-rust-many-args-dep"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1520,7 +1508,6 @@ name = "solana-bpf-rust-noop"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1528,7 +1515,6 @@ name = "solana-bpf-rust-panic"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1537,7 +1523,6 @@ version = "1.2.9"
 dependencies = [
  "solana-bpf-rust-param-passing-dep 1.2.9",
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1545,7 +1530,6 @@ name = "solana-bpf-rust-param-passing-dep"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1553,7 +1537,6 @@ name = "solana-bpf-rust-sysval"
 version = "1.2.9"
 dependencies = [
  "solana-sdk 1.2.9",
- "solana-sdk-bpf-test 1.2.9",
 ]
 
 [[package]]
@@ -1698,10 +1681,6 @@ dependencies = [
  "thiserror 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "solana-sdk-bpf-test"
-version = "1.2.9"
-
 [[package]]
 name = "solana-sdk-macro"
 version = "1.2.9"
diff --git a/programs/bpf/rust/128bit/Cargo.toml b/programs/bpf/rust/128bit/Cargo.toml
index e9723c6ea6..e66ed6fcb8 100644
--- a/programs/bpf/rust/128bit/Cargo.toml
+++ b/programs/bpf/rust/128bit/Cargo.toml
@@ -15,9 +15,6 @@ edition = "2018"
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.2.9" }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/128bit/src/lib.rs b/programs/bpf/rust/128bit/src/lib.rs
index cbed7d9ff8..d142f05ca2 100644
--- a/programs/bpf/rust/128bit/src/lib.rs
+++ b/programs/bpf/rust/128bit/src/lib.rs
@@ -54,7 +54,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_entrypoint() {
diff --git a/programs/bpf/rust/128bit_dep/Cargo.toml b/programs/bpf/rust/128bit_dep/Cargo.toml
index cf12e98b50..3f735c803b 100644
--- a/programs/bpf/rust/128bit_dep/Cargo.toml
+++ b/programs/bpf/rust/128bit_dep/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml
index d7aad739a1..01caaf96c7 100644
--- a/programs/bpf/rust/alloc/Cargo.toml
+++ b/programs/bpf/rust/alloc/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/alloc/src/lib.rs b/programs/bpf/rust/alloc/src/lib.rs
index b6d990d414..3f1a3f483a 100644
--- a/programs/bpf/rust/alloc/src/lib.rs
+++ b/programs/bpf/rust/alloc/src/lib.rs
@@ -86,7 +86,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_entrypoint() {
diff --git a/programs/bpf/rust/dep_crate/Cargo.toml b/programs/bpf/rust/dep_crate/Cargo.toml
index 761a79db56..0395bc2c1e 100644
--- a/programs/bpf/rust/dep_crate/Cargo.toml
+++ b/programs/bpf/rust/dep_crate/Cargo.toml
@@ -15,9 +15,6 @@ edition = "2018"
 byteorder = { version = "1", default-features = false }
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/dep_crate/src/lib.rs b/programs/bpf/rust/dep_crate/src/lib.rs
index f7e6d8e568..cd2b3d2387 100644
--- a/programs/bpf/rust/dep_crate/src/lib.rs
+++ b/programs/bpf/rust/dep_crate/src/lib.rs
@@ -21,7 +21,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_entrypoint() {
diff --git a/programs/bpf/rust/dup_accounts/Cargo.toml b/programs/bpf/rust/dup_accounts/Cargo.toml
index 52c566090c..dd3773ac3e 100644
--- a/programs/bpf/rust/dup_accounts/Cargo.toml
+++ b/programs/bpf/rust/dup_accounts/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/error_handling/Cargo.toml b/programs/bpf/rust/error_handling/Cargo.toml
index bfd91d9cc1..58058e1838 100644
--- a/programs/bpf/rust/error_handling/Cargo.toml
+++ b/programs/bpf/rust/error_handling/Cargo.toml
@@ -17,9 +17,6 @@ num-traits = "0.2"
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 thiserror = "1.0"
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/external_spend/Cargo.toml b/programs/bpf/rust/external_spend/Cargo.toml
index dee7843c01..f30e5ad128 100644
--- a/programs/bpf/rust/external_spend/Cargo.toml
+++ b/programs/bpf/rust/external_spend/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/invoke/Cargo.toml b/programs/bpf/rust/invoke/Cargo.toml
index e3e99aa57c..2874637b9a 100644
--- a/programs/bpf/rust/invoke/Cargo.toml
+++ b/programs/bpf/rust/invoke/Cargo.toml
@@ -14,7 +14,6 @@ edition = "2018"
 [dependencies]
 solana-bpf-rust-invoked = { path = "../invoked"}
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
 
 [features]
 program = ["solana-sdk/program"]
diff --git a/programs/bpf/rust/invoke/src/lib.rs b/programs/bpf/rust/invoke/src/lib.rs
index b7a25b05ab..0816b1252c 100644
--- a/programs/bpf/rust/invoke/src/lib.rs
+++ b/programs/bpf/rust/invoke/src/lib.rs
@@ -201,4 +201,4 @@ fn process_instruction(
     Ok(())
 }
 
-solana_sdk_bpf_test::stubs!();
+solana_sdk::program_stubs!();
diff --git a/programs/bpf/rust/invoked/Cargo.toml b/programs/bpf/rust/invoked/Cargo.toml
index d155aefeff..20eec9e557 100644
--- a/programs/bpf/rust/invoked/Cargo.toml
+++ b/programs/bpf/rust/invoked/Cargo.toml
@@ -13,7 +13,6 @@ edition = "2018"
 
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
 
 [features]
 program = ["solana-sdk/program"]
diff --git a/programs/bpf/rust/invoked/src/lib.rs b/programs/bpf/rust/invoked/src/lib.rs
index f301f264c4..95db3140c1 100644
--- a/programs/bpf/rust/invoked/src/lib.rs
+++ b/programs/bpf/rust/invoked/src/lib.rs
@@ -192,4 +192,4 @@ fn process_instruction(
     Ok(())
 }
 
-solana_sdk_bpf_test::stubs!();
+solana_sdk::program_stubs!();
diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml
index 3095631dbb..198d710d82 100644
--- a/programs/bpf/rust/iter/Cargo.toml
+++ b/programs/bpf/rust/iter/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/iter/src/lib.rs b/programs/bpf/rust/iter/src/lib.rs
index c45639a174..c5f7b5b829 100644
--- a/programs/bpf/rust/iter/src/lib.rs
+++ b/programs/bpf/rust/iter/src/lib.rs
@@ -22,7 +22,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_entrypoint() {
diff --git a/programs/bpf/rust/many_args/Cargo.toml b/programs/bpf/rust/many_args/Cargo.toml
index e2d5736dda..6a1d607487 100644
--- a/programs/bpf/rust/many_args/Cargo.toml
+++ b/programs/bpf/rust/many_args/Cargo.toml
@@ -15,9 +15,6 @@ edition = "2018"
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.2.9" }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/many_args/src/lib.rs b/programs/bpf/rust/many_args/src/lib.rs
index 6ea4388177..1e57b55a08 100644
--- a/programs/bpf/rust/many_args/src/lib.rs
+++ b/programs/bpf/rust/many_args/src/lib.rs
@@ -30,7 +30,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_entrypoint() {
diff --git a/programs/bpf/rust/many_args_dep/Cargo.toml b/programs/bpf/rust/many_args_dep/Cargo.toml
index f93d8bf78f..9b53280348 100644
--- a/programs/bpf/rust/many_args_dep/Cargo.toml
+++ b/programs/bpf/rust/many_args_dep/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/many_args_dep/src/lib.rs b/programs/bpf/rust/many_args_dep/src/lib.rs
index 5556a5de2d..66025da29d 100644
--- a/programs/bpf/rust/many_args_dep/src/lib.rs
+++ b/programs/bpf/rust/many_args_dep/src/lib.rs
@@ -52,7 +52,7 @@ pub fn many_args_sret(
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_many_args() {
diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml
index 682ca6d0bf..bb53617dd4 100644
--- a/programs/bpf/rust/noop/Cargo.toml
+++ b/programs/bpf/rust/noop/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/noop/src/lib.rs b/programs/bpf/rust/noop/src/lib.rs
index e2db6da550..0ae7de8f6a 100644
--- a/programs/bpf/rust/noop/src/lib.rs
+++ b/programs/bpf/rust/noop/src/lib.rs
@@ -68,7 +68,7 @@ fn process_instruction(
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_return_sstruct() {
diff --git a/programs/bpf/rust/panic/Cargo.toml b/programs/bpf/rust/panic/Cargo.toml
index 8126c6d1ff..ebb6bcfdc4 100644
--- a/programs/bpf/rust/panic/Cargo.toml
+++ b/programs/bpf/rust/panic/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/param_passing/Cargo.toml b/programs/bpf/rust/param_passing/Cargo.toml
index ced9cc5245..c3e4ea2df1 100644
--- a/programs/bpf/rust/param_passing/Cargo.toml
+++ b/programs/bpf/rust/param_passing/Cargo.toml
@@ -15,9 +15,6 @@ edition = "2018"
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.2.9" }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/param_passing/src/lib.rs b/programs/bpf/rust/param_passing/src/lib.rs
index f0f28a65d6..44fc9f009f 100644
--- a/programs/bpf/rust/param_passing/src/lib.rs
+++ b/programs/bpf/rust/param_passing/src/lib.rs
@@ -27,7 +27,7 @@ pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_entrypoint() {
diff --git a/programs/bpf/rust/param_passing_dep/Cargo.toml b/programs/bpf/rust/param_passing_dep/Cargo.toml
index 0586e46875..b6e66b8bc3 100644
--- a/programs/bpf/rust/param_passing_dep/Cargo.toml
+++ b/programs/bpf/rust/param_passing_dep/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/programs/bpf/rust/param_passing_dep/src/lib.rs b/programs/bpf/rust/param_passing_dep/src/lib.rs
index 722db53df4..ff5e9e4ae4 100644
--- a/programs/bpf/rust/param_passing_dep/src/lib.rs
+++ b/programs/bpf/rust/param_passing_dep/src/lib.rs
@@ -28,7 +28,7 @@ impl<'a> TestDep {
 mod test {
     use super::*;
     // Pulls in the stubs required for `info!()`
-    solana_sdk_bpf_test::stubs!();
+    solana_sdk::program_stubs!();
 
     #[test]
     fn test_dep() {
diff --git a/programs/bpf/rust/sysval/Cargo.toml b/programs/bpf/rust/sysval/Cargo.toml
index d3abda6219..d07b11d0fc 100644
--- a/programs/bpf/rust/sysval/Cargo.toml
+++ b/programs/bpf/rust/sysval/Cargo.toml
@@ -14,9 +14,6 @@ edition = "2018"
 [dependencies]
 solana-sdk = { path = "../../../../sdk/", version = "1.2.9", default-features = false }
 
-[dev_dependencies]
-solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/test", version = "1.2.9" }
-
 [features]
 program = ["solana-sdk/program"]
 default = ["program"]
diff --git a/sdk/bpf/rust/test/.gitignore b/sdk/bpf/rust/test/.gitignore
deleted file mode 100644
index e1e121d124..0000000000
--- a/sdk/bpf/rust/test/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target/
-/farf/
-Cargo.lock
diff --git a/sdk/bpf/rust/test/src/lib.rs b/sdk/bpf/rust/test/src/lib.rs
deleted file mode 100644
index 37d46323f7..0000000000
--- a/sdk/bpf/rust/test/src/lib.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-//! @brief Stubs for syscalls when building tests for x86
-
-#[no_mangle]
-/// # Safety
-pub unsafe fn sol_log_(message: *const u8, length: u64) {
-    let slice = std::slice::from_raw_parts(message, length as usize);
-    let string = std::str::from_utf8(&slice).unwrap();
-    std::println!("{}", string);
-}
-
-#[no_mangle]
-pub fn sol_log_64_(arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64) {
-    std::println!("{} {} {} {} {}", arg1, arg2, arg3, arg4, arg5);
-}
-
-#[no_mangle]
-pub fn sol_invoke_signed_rust() {
-    std::println!("sol_invoke_signed_rust()");
-}
-
-#[macro_export]
-macro_rules! stubs {
-    () => {
-        #[test]
-        fn pull_in_externs() {
-            use $crate::*;
-            unsafe { sol_log_("sol_log_".as_ptr(), 8) };
-            sol_log_64_(1, 2, 3, 4, 5);
-            sol_invoke_signed_rust();
-        }
-    };
-}
diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
index 92d2f8fe0a..292ec51092 100644
--- a/sdk/src/lib.rs
+++ b/sdk/src/lib.rs
@@ -67,6 +67,7 @@ pub mod entrypoint;
 pub mod log;
 pub mod program;
 pub mod program_error;
+pub mod program_stubs;
 
 // Modules not usable by on-chain programs
 #[cfg(not(feature = "program"))]
diff --git a/sdk/src/program_stubs.rs b/sdk/src/program_stubs.rs
new file mode 100644
index 0000000000..b3557ed001
--- /dev/null
+++ b/sdk/src/program_stubs.rs
@@ -0,0 +1,48 @@
+//! @brief Stubs for syscalls when building tests for non-BPF targets
+
+#[cfg(not(target_arch = "bpf"))]
+fn print_line_to_stdout(_message: &str) {
+    #[cfg(not(feature = "program"))]
+    {
+        use std::io::{self, Write};
+        io::stdout()
+            .write_all(format!("{}\n", _message).as_bytes())
+            .unwrap();
+        io::stdout().flush().unwrap();
+    }
+}
+
+#[cfg(not(target_arch = "bpf"))]
+#[no_mangle]
+/// # Safety
+pub unsafe fn sol_log_(message: *const u8, length: u64) {
+    let slice = std::slice::from_raw_parts(message, length as usize);
+    let string = std::str::from_utf8(&slice).unwrap();
+    print_line_to_stdout(string);
+}
+
+#[cfg(not(target_arch = "bpf"))]
+#[no_mangle]
+pub fn sol_log_64_(arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64) {
+    print_line_to_stdout(&format!("{} {} {} {} {}", arg1, arg2, arg3, arg4, arg5));
+}
+
+#[cfg(not(target_arch = "bpf"))]
+#[no_mangle]
+pub fn sol_invoke_signed_rust() {
+    print_line_to_stdout("sol_invoke_signed_rust()");
+}
+
+#[macro_export]
+macro_rules! program_stubs {
+    () => {
+        #[cfg(not(target_arch = "bpf"))]
+        #[test]
+        fn pull_in_externs() {
+            use solana_sdk::program_stubs::{sol_invoke_signed_rust, sol_log_, sol_log_64_};
+            unsafe { sol_log_("sol_log_".as_ptr(), 8) };
+            sol_log_64_(1, 2, 3, 4, 5);
+            sol_invoke_signed_rust();
+        }
+    };
+}