diff --git a/Cargo.toml b/Cargo.toml
index 124328df..f48c5dac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-    "osdk/test-kernel",
+    "osdk/deps/test-kernel",
     "ostd",
     "ostd/libs/align_ext",
     "ostd/libs/ostd-macros",
diff --git a/Makefile b/Makefile
index 30a38f5a..8df4b826 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ NON_OSDK_CRATES := \
 # In contrast, OSDK crates depend on OSTD (or being `ostd` itself)
 # and need to be built or tested with OSDK.
 OSDK_CRATES := \
-	osdk/test-kernel \
+	osdk/deps/test-kernel \
 	ostd \
 	ostd/libs/linux-bzimage/setup \
 	kernel \
diff --git a/osdk/deps/README.md b/osdk/deps/README.md
new file mode 100644
index 00000000..70d07661
--- /dev/null
+++ b/osdk/deps/README.md
@@ -0,0 +1,4 @@
+# OSDK deps
+
+This directory contains libraries or kernels that depends on OSTD, independent
+to OSTD but by-default shipped with OSDK.
diff --git a/osdk/test-kernel/Cargo.toml b/osdk/deps/test-kernel/Cargo.toml
similarity index 87%
rename from osdk/test-kernel/Cargo.toml
rename to osdk/deps/test-kernel/Cargo.toml
index 73ecfc6c..e61ddd3d 100644
--- a/osdk/test-kernel/Cargo.toml
+++ b/osdk/deps/test-kernel/Cargo.toml
@@ -9,7 +9,7 @@ repository ="https://github.com/asterinas/asterinas"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ostd = { version = "0.11.3", path = "../../ostd" }
+ostd = { version = "0.11.3", path = "../../../ostd" }
 owo-colors = "4.0.0"
 
 [lints]
diff --git a/osdk/test-kernel/src/lib.rs b/osdk/deps/test-kernel/src/lib.rs
similarity index 100%
rename from osdk/test-kernel/src/lib.rs
rename to osdk/deps/test-kernel/src/lib.rs
diff --git a/osdk/test-kernel/src/path.rs b/osdk/deps/test-kernel/src/path.rs
similarity index 100%
rename from osdk/test-kernel/src/path.rs
rename to osdk/deps/test-kernel/src/path.rs
diff --git a/osdk/test-kernel/src/tree.rs b/osdk/deps/test-kernel/src/tree.rs
similarity index 100%
rename from osdk/test-kernel/src/tree.rs
rename to osdk/deps/test-kernel/src/tree.rs
diff --git a/osdk/src/base_crate/mod.rs b/osdk/src/base_crate/mod.rs
index d335daa9..43f7d126 100644
--- a/osdk/src/base_crate/mod.rs
+++ b/osdk/src/base_crate/mod.rs
@@ -228,7 +228,7 @@ fn add_manifest_dependency(
         let dep_str = match option_env!("OSDK_LOCAL_DEV") {
             Some("1") => {
                 let crate_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-                let test_kernel_dir = crate_dir.join("test-kernel");
+                let test_kernel_dir = crate_dir.join("deps").join("test-kernel");
                 format!(
                     "osdk-test-kernel = {{ path = \"{}\" }}",
                     test_kernel_dir.display()
diff --git a/tools/bump_version.sh b/tools/bump_version.sh
index c424e0b5..0f334dfc 100755
--- a/tools/bump_version.sh
+++ b/tools/bump_version.sh
@@ -110,7 +110,7 @@ LINUX_BOOT_PARAMS_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/boot-
 LINUX_BZIMAGE_BUILDER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/builder/Cargo.toml
 LINUX_BZIMAGE_SETUP_CARGO_TOML_PATH=${ASTER_SRC_DIR}/ostd/libs/linux-bzimage/setup/Cargo.toml
 OSDK_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/Cargo.toml
-OSDK_TEST_RUNNER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/test-kernel/Cargo.toml
+OSDK_TEST_RUNNER_CARGO_TOML_PATH=${ASTER_SRC_DIR}/osdk/deps/test-kernel/Cargo.toml
 VERSION_PATH=${ASTER_SRC_DIR}/VERSION
 
 current_version=$(cat ${VERSION_PATH})
diff --git a/tools/github_workflows/publish_osdk_and_ostd.sh b/tools/github_workflows/publish_osdk_and_ostd.sh
index 50c52c91..8e69226f 100755
--- a/tools/github_workflows/publish_osdk_and_ostd.sh
+++ b/tools/github_workflows/publish_osdk_and_ostd.sh
@@ -83,7 +83,7 @@ for TARGET in $TARGETS; do
     do_publish_for ostd/libs/ostd-test $TARGET
     do_publish_for ostd/libs/linux-bzimage/setup $TARGET
     do_publish_for ostd $TARGET
-    do_publish_for osdk/test-kernel $TARGET
+    do_publish_for osdk/deps/test-kernel $TARGET
 
     # For actual publishing, we should only publish once. Using any target that
     # OSTD supports is OK. Here we use the first target in the list.