diff --git a/Runner/suites/Kernel/Baseport/usb_msd/README.md b/Runner/suites/Kernel/Baseport/usb_msd/README.md
new file mode 100644
index 00000000..32da373b
--- /dev/null
+++ b/Runner/suites/Kernel/Baseport/usb_msd/README.md
@@ -0,0 +1,37 @@
+```
+Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+SPDX-License-Identifier: BSD-3-Clause-Clear
+```
+
+# USB MSD Validation
+
+## Overview
+
+This shell script executes on the DUT (Device-Under-Test) and verifies enumeration of connected USB Mass Storage Devices (MSD).
+
+---
+
+## Setup
+
+- Connect USB MSD peripheral(s) to USB port(s) on DUT.
+- Only applicable for USB ports that support Host Mode functionality. 
+- USB MSD peripherals examples: USB flash drive, external HDD/SSD, etc. 
+
+---
+
+## Usage
+### Instructions:
+1. **Copy the test suite to the target device** using `scp` or any preferred method.
+2. **Navigate to the test directory** on the target device.
+3. **Run the test script** using the test runner or directly.
+
+---
+
+### Quick Example
+```bash
+git clone <this-repo>
+cd <this-repo>
+scp -r common Runner user@target_device_ip:<path-on-device>
+ssh user@target_device_ip
+cd <path-on-device>/Runner && ./run-test.sh usb_msd
+```
\ No newline at end of file
diff --git a/Runner/suites/Kernel/Baseport/usb_msd/run.sh b/Runner/suites/Kernel/Baseport/usb_msd/run.sh
new file mode 100755
index 00000000..24486d77
--- /dev/null
+++ b/Runner/suites/Kernel/Baseport/usb_msd/run.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+# SPDX-License-Identifier: BSD-3-Clause-Clear
+
+# Validate USB Mass Storage device detection
+# Requires at least one USB Mass Storage peripheral (USB flash drive, external HDD/SSD, etc.) connected to a USB Host port.
+
+# Robustly find and source init_env
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+INIT_ENV=""
+SEARCH="$SCRIPT_DIR"
+while [ "$SEARCH" != "/" ]; do
+    if [ -f "$SEARCH/init_env" ]; then
+        INIT_ENV="$SEARCH/init_env"
+        break
+    fi
+    SEARCH=$(dirname "$SEARCH")
+done
+
+if [ -z "$INIT_ENV" ]; then
+    echo "[ERROR] Could not find init_env (starting at $SCRIPT_DIR)" >&2
+    exit 1
+fi
+
+# Only source if not already loaded (idempotent)
+if [ -z "$__INIT_ENV_LOADED" ]; then
+    # shellcheck disable=SC1090
+    . "$INIT_ENV"
+	__INIT_ENV_LOADED=1
+fi
+# Always source functestlib.sh, using $TOOLS exported by init_env
+# shellcheck disable=SC1090,SC1091
+. "$TOOLS/functestlib.sh"
+
+TESTNAME="usb_msd"
+test_path=$(find_test_case_by_name "$TESTNAME")
+cd "$test_path" || exit 1
+# shellcheck disable=SC2034
+res_file="./$TESTNAME.res"
+
+log_info "-----------------------------------------------------------------------------------------"
+log_info "-------------------Starting $TESTNAME Testcase----------------------------"
+log_info "=== Test Initialization ==="
+
+# Check if grep is installed, else skip test
+deps_list="grep"
+check_dependencies "$deps_list"
+
+# Count interfaces with bInterfaceClass = 08 (MSD) under /sys/bus/usb/devices
+msd_iface_count=0
+log_info "=== USB Mass Storage device Detection ==="
+msd_iface_count="$(cat /sys/bus/usb/devices/*/bInterfaceClass 2>/dev/null | grep -i '08' | wc -l)"
+
+printf "Number of MSD interfaces found: $msd_iface_count"
+
+if [ "$msd_iface_count" -gt 0 ]; then
+    log_pass "$TESTNAME : Test Passed - USB Mass Storage interface(s) detected"
+    echo "$TESTNAME PASS" > "$res_file"
+    exit 0
+else
+    log_fail "$TESTNAME : Test Failed - No 'Mass Storage' interface found"
+    echo "$TESTNAME FAIL" > "$res_file"
+    exit 1
+fi
+
+log_info "-------------------Completed $TESTNAME Testcase----------------------------"
diff --git a/Runner/suites/Kernel/Baseport/usb_msd/usb_msd.yaml b/Runner/suites/Kernel/Baseport/usb_msd/usb_msd.yaml
new file mode 100644
index 00000000..10230ee9
--- /dev/null
+++ b/Runner/suites/Kernel/Baseport/usb_msd/usb_msd.yaml
@@ -0,0 +1,16 @@
+metadata:
+  name: usb-msd
+  format: "Lava-Test Test Definition 1.0"
+  description: "This shell script executes on the DUT (Device-Under-Test) and verifies enumeration of connected USB Mass Storage Devices (MSD)."
+  os:
+    - linux
+  scope:
+    - functional
+
+run:
+  steps:
+    - REPO_PATH=$PWD
+    - cd Runner/suites/Kernel/Baseport/usb_msd
+    - ./run.sh || true
+    - $REPO_PATH/Runner/utils/send-to-lava.sh usb_msd.res || true
+