diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 6c829037..a1f2af30 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -101,7 +101,7 @@ jobs:
       - name: Add the permission to run
         run: chmod +x ./youki
       - name: Run integration tests
-        run: just oci-tests
+        run: just test-oci
 
   oci-validation-rust:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2c35733c..a7a3478a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,8 +22,8 @@ jobs:
         run: just youki-release
       - name: test
         # TODO(utam0k): The feature test needs nightly
-        # run: just unittest featuretest oci-tests
-        run: just unittest oci-tests
+        # run: just test-basic featuretest test-oci
+        run: just test-basic test-oci
 
   upload:
     name: Upload
diff --git a/README.md b/README.md
index 1ac3a4a2..c6aed17c 100644
--- a/README.md
+++ b/README.md
@@ -292,7 +292,7 @@ Go and node-tap are required to run integration tests. See the [opencontainers/r
 
 ```bash
 git submodule update --init --recursive
-just oci-tests
+just test-oci
 ```
 
 ### Setting up Vagrant
diff --git a/justfile b/justfile
index 05cf16c2..6fbe6a98 100644
--- a/justfile
+++ b/justfile
@@ -28,11 +28,18 @@ rust-oci-tests-bin:
 
 # Tests
 
-# run oci tests
-test-oci: oci-tests rust-oci-tests
+# run integration tests
+test-integration: test-oci rust-oci-tests
 
 # run all tests except rust-oci 
-test-all: unittest test-features oci-tests containerd-test # currently not doing rust-oci here
+test-all: test-basic test-features oci-tests containerd-test # currently not doing rust-oci here
+
+# run basic tests
+test-basic: test-unit test-doc
+
+# run cargo unit tests
+test-unit:
+    cargo test --lib --bins --all --all-targets --all-features
 
 # run cargo doc tests
 test-doc:
@@ -46,8 +53,8 @@ test-features:
 test-musl:
     {{ cwd }}/scripts/musl_test.sh
 
-# run oci integration tests
-oci-tests: 
+# run oci integration tests through runtime-tools
+test-oci:
     {{ cwd }}/scripts/oci_integration_tests.sh {{ cwd }}
 
 # run rust oci integration tests
@@ -89,7 +96,7 @@ bin-kind:
 # Clean
 
 # Clean kind test env
-clean-test-kind:
+test-kind-clean:
 	kind delete cluster --name {{ KIND_CLUSTER_NAME }}
 
 # misc