diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index 5de2742c2..0ea34f68c 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -26,8 +26,9 @@ fn main() {
             args.remove(0);
         }
     }
-    args.push("--arch".to_string());
-    args.push("bpf".to_string());
+    let index = args.iter().position(|x| x == "--").unwrap_or(args.len());
+    args.insert(index, "bpf".to_string());
+    args.insert(index, "--arch".to_string());
     print!("cargo-build-bpf child: {}", program.display());
     for a in &args {
         print!(" {}", a);
diff --git a/sdk/cargo-test-bpf/src/main.rs b/sdk/cargo-test-bpf/src/main.rs
index fee4dc738..af5a382fd 100644
--- a/sdk/cargo-test-bpf/src/main.rs
+++ b/sdk/cargo-test-bpf/src/main.rs
@@ -32,8 +32,9 @@ fn main() {
             args.remove(0);
         }
     }
-    args.push("--arch".to_string());
-    args.push("bpf".to_string());
+    let index = args.iter().position(|x| x == "--").unwrap_or(args.len());
+    args.insert(index, "bpf".to_string());
+    args.insert(index, "--arch".to_string());
     print!("cargo-test-bpf child: {}", program.display());
     for a in &args {
         print!(" {}", a);