diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
index 4d4f19c9..4a9d9828 100644
--- a/.github/actions/test/action.yml
+++ b/.github/actions/test/action.yml
@@ -36,8 +36,8 @@ inputs:
   extra_blocklists:
     description: 'Extra blocklists directories'
     required: false
-  syscall_test_dir:
-    description: 'Syscall test directory'
+  syscall_test_workdir:
+    description: 'Syscall test working directory'
     required: false
   boot_protocol:
     description: 'Boot protocol (linux-efi-handover64/multiboot/multiboot2/linux-legacy32)'
@@ -85,7 +85,7 @@ runs:
         [[ -n "${{ inputs.scheme }}" ]] && CMD+=" SCHEME=${{ inputs.scheme }}"
         [[ -n "${{ inputs.arch }}" ]] && CMD+=" ARCH=${{ inputs.arch }}"
         [[ -n "${{ inputs.extra_blocklists }}" ]] && CMD+=" EXTRA_BLOCKLISTS_DIRS=${{ inputs.extra_blocklists }}"
-        [[ -n "${{ inputs.syscall_test_dir }}" ]] && CMD+=" SYSCALL_TEST_DIR=${{ inputs.syscall_test_dir }}"
+        [[ -n "${{ inputs.syscall_test_workdir }}" ]] && CMD+=" SYSCALL_TEST_WORKDIR=${{ inputs.syscall_test_workdir }}"
         [[ -n "${{ inputs.boot_protocol }}" ]] && CMD+=" BOOT_PROTOCOL=${{ inputs.boot_protocol }}"
         
         echo "Executing: $CMD"
diff --git a/.github/workflows/test_x86.yml b/.github/workflows/test_x86.yml
index d8af6f8c..a9ad3b63 100644
--- a/.github/workflows/test_x86.yml
+++ b/.github/workflows/test_x86.yml
@@ -49,18 +49,18 @@ jobs:
           # Syscall Test at Ext2 (MicroVM)
           - test_id: 'syscall-ext2-microvm'
             scheme: 'microvm'
-            syscall_test_dir: '/ext2'
+            syscall_test_workdir: '/ext2'
           # Syscall Test at Ext2 (IOMMU) (Debug Build)
           - test_id: 'syscall-ext2-iommu-debug'
             scheme: 'iommu'
-            syscall_test_dir: '/ext2'
+            syscall_test_workdir: '/ext2'
             release: false
           # Syscall Test at Exfat (Multiboot2) (without KVM enabled)
           - test_id: 'syscall-exfat-multiboot2-nokvm'
             boot_protocol: 'multiboot2'
             enable_kvm: false
             extra_blocklists: 'blocklists.exfat'
-            syscall_test_dir: '/exfat'
+            syscall_test_workdir: '/exfat'
           # SMP Syscall Test (Multiboot2)
           - test_id: 'syscall-multiboot2-smp4'
             boot_protocol: 'multiboot2'
@@ -87,7 +87,7 @@ jobs:
           netdev: ${{ matrix.netdev || 'tap' }}
           scheme: ${{ matrix.scheme }}
           extra_blocklists: ${{ matrix.extra_blocklists }}
-          syscall_test_dir: ${{ matrix.syscall_test_dir }}
+          syscall_test_workdir: ${{ matrix.syscall_test_workdir }}
           boot_protocol: ${{ matrix.boot_protocol || 'linux-efi-handover64' }}
 
   osdk-test:
diff --git a/.github/workflows/test_x86_tdx.yml b/.github/workflows/test_x86_tdx.yml
index 37979dc0..7c58bb21 100644
--- a/.github/workflows/test_x86_tdx.yml
+++ b/.github/workflows/test_x86_tdx.yml
@@ -27,7 +27,7 @@ jobs:
           # Syscall Test at Exfat
           - test_id: 'syscall-exfat'
             extra_blocklists: 'blocklists.exfat'
-            syscall_test_dir: '/exfat'
+            syscall_test_workdir: '/exfat'
           # SMP Syscall Test
           - test_id: 'syscall-smp4'
             netdev: 'tap'
@@ -52,7 +52,7 @@ jobs:
           smp: ${{ matrix.smp }}
           netdev: ${{ matrix.netdev }}
           extra_blocklists: ${{ matrix.extra_blocklists }}
-          syscall_test_dir: ${{ matrix.syscall_test_dir }}
+          syscall_test_workdir: ${{ matrix.syscall_test_workdir }}
 
   osdk-test:
     runs-on: self-hosted
diff --git a/Makefile b/Makefile
index 3a5cf875..fb70a7f6 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ GDB_PROFILE_INTERVAL ?= 0.1
 # Here are the options for the auto test feature.
 AUTO_TEST ?= none
 EXTRA_BLOCKLISTS_DIRS ?= ""
-SYSCALL_TEST_DIR ?= /tmp
+SYSCALL_TEST_WORKDIR ?= /tmp
 # End of auto test features.
 
 # Network settings
@@ -53,7 +53,7 @@ CARGO_OSDK_ARGS := --target-arch=$(ARCH) --kcmd-args="ostd.log_level=$(LOG_LEVEL
 
 ifeq ($(AUTO_TEST), syscall)
 BUILD_SYSCALL_TEST := 1
-CARGO_OSDK_ARGS += --kcmd-args="SYSCALL_TEST_DIR=$(SYSCALL_TEST_DIR)"
+CARGO_OSDK_ARGS += --kcmd-args="SYSCALL_TEST_WORKDIR=$(SYSCALL_TEST_WORKDIR)"
 CARGO_OSDK_ARGS += --kcmd-args="EXTRA_BLOCKLISTS_DIRS=$(EXTRA_BLOCKLISTS_DIRS)"
 CARGO_OSDK_ARGS += --init-args="/opt/syscall_test/run_syscall_test.sh"
 else ifeq ($(AUTO_TEST), test)
diff --git a/test/syscall_test/run_syscall_test.sh b/test/syscall_test/run_syscall_test.sh
index 7d711a64..24445888 100755
--- a/test/syscall_test/run_syscall_test.sh
+++ b/test/syscall_test/run_syscall_test.sh
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MPL-2.0
 
 SCRIPT_DIR=$(dirname "$0")
-TEST_TMP_DIR=${SYSCALL_TEST_DIR:-/tmp}
+TEST_TMP_DIR=${SYSCALL_TEST_WORKDIR:-/tmp}
 TEST_BIN_DIR=$SCRIPT_DIR/tests
 BLOCKLIST_DIR=$SCRIPT_DIR/blocklists
 FAIL_CASES=$SCRIPT_DIR/fail_cases