diff --git a/osdk/src/base_crate/mod.rs b/osdk/src/base_crate/mod.rs
index f7a482052..e06d91a10 100644
--- a/osdk/src/base_crate/mod.rs
+++ b/osdk/src/base_crate/mod.rs
@@ -131,14 +131,22 @@ fn add_manifest_dependency(
 
     if link_unit_test_runner {
         let dep_str = match option_env!("OSDK_LOCAL_DEV") {
-            Some("1") => "osdk-test-kernel = { path = \"../../../osdk/test-kernel\" }",
+            Some("1") => {
+                let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+                let test_kernel_dir = crate_dir.join("test-kernel");
+                format!(
+                    "osdk-test-kernel = {{ path = \"{}\" }}",
+                    test_kernel_dir.display()
+                )
+            }
             _ => concat!(
                 "osdk-test-kernel = { version = \"",
                 env!("CARGO_PKG_VERSION"),
                 "\" }"
-            ),
+            )
+            .to_owned(),
         };
-        let test_runner_dep = toml::Table::from_str(dep_str).unwrap();
+        let test_runner_dep = toml::Table::from_str(&dep_str).unwrap();
         dependencies.as_table_mut().unwrap().extend(test_runner_dep);
     }
 
diff --git a/osdk/src/commands/build/bin.rs b/osdk/src/commands/build/bin.rs
index 29194b0f2..4fae95368 100644
--- a/osdk/src/commands/build/bin.rs
+++ b/osdk/src/commands/build/bin.rs
@@ -172,8 +172,9 @@ fn install_setup_with_arch(
     cmd.arg("--force");
     cmd.arg("--root").arg(install_dir.as_ref());
     if matches!(option_env!("OSDK_LOCAL_DEV"), Some("1")) {
-        cmd.arg("--path")
-            .arg("../../../ostd/libs/linux-bzimage/setup");
+        let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        let setup_dir = crate_dir.join("../ostd/libs/linux-bzimage/setup");
+        cmd.arg("--path").arg(setup_dir);
     }
     // Remember to upgrade this version if new version of linux-bzimage-setup is released.
     const LINUX_BZIMAGE_SETUP_VERSION: &str = "0.1.0";