diff --git a/examples/ota-requestor-app/linux/README.md b/examples/ota-requestor-app/linux/README.md
index 47434a8151f758..081e38bf78c490 100644
--- a/examples/ota-requestor-app/linux/README.md
+++ b/examples/ota-requestor-app/linux/README.md
@@ -21,6 +21,7 @@ following command line options are available for the OTA Requestor application.
 | --------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | -q/--delayQuery <Time in seconds> | From boot up, the amount of time to wait before triggering the QueryImage command. If none or zero is supplied, QueryImage will not be triggered automatically. At least one provider location must be written to the DefaultOTAProviders attribute. |
 | -c/--requestorCanConsent          | If supplied, the RequestorCanConsent field of the QueryImage command is set to true. Otherwise, the value is determined by the driver.                                                                                                               |
+| -f/--otaDownloadPath <file path>  | If supplied, the OTA image is downloaded to the given fully-qualified file-path. Otherwise, the value defaults to /tmp/test.bin.                                                                                                                     |
 
 ## Software Image Header
 
@@ -86,7 +87,7 @@ Follow instructions
 #### Run the OTA Requestor application:
 
 ```
-out/chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --delayQuery ${TIME_IN_SECONDS}
+out/chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --secured-device-port ${REQUESTOR_UDP_PORT} --KVS ${KVS_STORE_LOCATION} --delayQuery ${TIME_IN_SECONDS} --otaDownloadPath ${OTA_FILE_PATH}
 ```
 
 -   `${REQUESTOR_LONG_DISCRIMINATOR}` is the long discriminator specified for
@@ -101,6 +102,8 @@ out/chip-ota-requestor-app --discriminator ${REQUESTOR_LONG_DISCRIMINATOR} --sec
     the value used by the OTA Provider application.
 -   `${TIME_IN_SECONDS}` is the amount of time to wait before triggering the
     QueryImage command specified by the DefaultOTAProviders attribute
+-   `${OTA_FILE_PATH}` is the fully-qualified path for the OTA file download
+    location
 
 #### Commission the OTA Requestor application
 
@@ -212,7 +215,7 @@ scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux/ out chip_
 **Run the OTA Requestor application**
 
 ```
-out/chip-ota-requestor-app --discriminator 18 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor --delayQuery 30
+out/chip-ota-requestor-app --discriminator 18 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor --delayQuery 30 --otaDownloadPath /tmp/test.bin
 ```
 
 #### In terminal 3:
@@ -257,7 +260,7 @@ specified below:
 
 ```
 scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux/ out chip_config_network_layer_ble=false
-out/chip-ota-requestor-app --discriminator 18 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor
+out/chip-ota-requestor-app --discriminator 18 --secured-device-port 5560 --KVS /tmp/chip_kvs_requestor --otaDownloadPath /tmp/test.bin
 ```
 
 **Commission to the first fabric**
@@ -297,6 +300,3 @@ out/chip-tool otasoftwareupdaterequestor read default-ota-providers 0x858 0 --co
 ```
 
 ## Limitations
-
--   Stores the downloaded file in the directory this reference app is launched
-    from
diff --git a/examples/ota-requestor-app/linux/main.cpp b/examples/ota-requestor-app/linux/main.cpp
index 319d82818f9910..4472d021a3a791 100644
--- a/examples/ota-requestor-app/linux/main.cpp
+++ b/examples/ota-requestor-app/linux/main.cpp
@@ -78,7 +78,7 @@ OptionSet cmdLineOptions = { HandleOptions, cmdLineOptionsDef, "PROGRAM OPTIONS"
                              "  -c/--requestorCanConsent\n"
                              "        If supplied, the RequestorCanConsent field of the QueryImage command is set to true.\n"
                              "        Otherwise, the value is determined by the driver.\n "
-                             "  -f/--otaDownloadPath\n"
+                             "  -f/--otaDownloadPath <file path>\n"
                              "        If supplied, the OTA image is downloaded to the given fully-qualified file-path.\n"
                              "        Otherwise, the value defaults to /tmp/test.bin.\n " };
 
@@ -94,8 +94,6 @@ static void InitOTARequestor(void)
 
     // WARNING: this is probably not realistic to know such details of the image or to even have an OTADownloader instantiated at
     // the beginning of program execution. We're using hardcoded values here for now since this is a reference application.
-    // TODO: instatiate and initialize these values when QueryImageResponse tells us an image is available
-    // TODO: add API for OTARequestor to pass QueryImageResponse info to the application to use for OTADownloader init
     OTAImageProcessorParams ipParams;
     ipParams.imageFile = CharSpan::fromCharString(gOtaDownloadPath);
     gImageProcessor.SetOTAImageProcessorParams(ipParams);
diff --git a/scripts/tests/ota_test.sh b/scripts/tests/ota_test.sh
index ea324c282a3f9d..96698b57937538 100755
--- a/scripts/tests/ota_test.sh
+++ b/scripts/tests/ota_test.sh
@@ -4,28 +4,29 @@ PASSCODE=${1:-20202021}
 DISCRIMINATOR=${2:-42}
 UDP_PORT=${3:-5560}
 OTA_DOWNLOAD_PATH=${4:-"/tmp/test.bin"}
+
 FIRMWARE_BIN="my-firmware.bin"
+FIRMWARE_OTA="my-firmware.ota"
 
-pkill chip-ota-provider-app
-pkill chip-ota-requestor-app
-rm my-firmware.ota "$FIRMWARE_BIN" "$OTA_DOWNLOAD_PATH"
+OTA_PROVIDER_APP="chip-ota-provider-app"
+OTA_REQUESTOR_APP="chip-ota-requestor-app"
 
-scripts/examples/gn_build_example.sh examples/chip-tool out/
+killall -e "$OTA_PROVIDER_APP" "$OTA_REQUESTOR_APP"
+rm -f "$FIRMWARE_OTA" "$FIRMWARE_BIN" "$OTA_DOWNLOAD_PATH"
 
-touch "$FIRMWARE_BIN"
+scripts/examples/gn_build_example.sh examples/chip-tool out/
 
 echo "Test" >"$FIRMWARE_BIN"
 
 rm /tmp/chip_*
 
-./src/app/ota_image_tool.py create -v 0xDEAD -p 0xBEEF -vn 1 -vs "1.0" -da sha256 "$FIRMWARE_BIN" my-firmware.ota
+./src/app/ota_image_tool.py create -v 0xDEAD -p 0xBEEF -vn 1 -vs "1.0" -da sha256 "$FIRMWARE_BIN" "$FIRMWARE_OTA"
 
-if [ ! -f "my-firmware.ota" ]; then
+if [ ! -f "$FIRMWARE_OTA" ]; then
     exit 1
 fi
 
-./out/ota_provider_debug/chip-ota-provider-app -f my-firmware.ota | tee /tmp/ota/provider-log.txt &
-provider_pid=$!
+./out/ota_provider_debug/"$OTA_PROVIDER_APP" -f "$FIRMWARE_OTA" | tee /tmp/ota/provider-log.txt &
 
 echo "Commissioning Provider"
 
@@ -38,8 +39,7 @@ fi
 
 ./out/chip-tool accesscontrol write acl '[{"fabricIndex": 1, "privilege": 5, "authMode": 2, "subjects": [112233], "targets": null}, {"fabricIndex": 1, "privilege": 3, "authMode": 2, "subjects": null, "targets": null}]' 1 0
 
-stdbuf -o0 ./out/ota_requestor_debug/chip-ota-requestor-app --discriminator "$DISCRIMINATOR" --secured-device-port "$UDP_PORT" --KVS /tmp/chip_kvs_requestor --otaDownloadPath "$OTA_DOWNLOAD_PATH" | tee /tmp/ota/requestor-log.txt &
-requestor_pid=$!
+stdbuf -o0 ./out/ota_requestor_debug/"$OTA_REQUESTOR_APP" --discriminator "$DISCRIMINATOR" --secured-device-port "$UDP_PORT" --KVS /tmp/chip_kvs_requestor --otaDownloadPath "$OTA_DOWNLOAD_PATH" | tee /tmp/ota/requestor-log.txt &
 
 echo "Commissioning Requestor"
 
@@ -59,8 +59,7 @@ timeout 30 grep -q "OTA image downloaded to" <(tail -n0 -f /tmp/ota/requestor-lo
 
 echo "Exiting, logs are in tmp/ota/"
 
-kill "$provider_pid"
-kill "$requestor_pid"
+killall -e "$OTA_PROVIDER_APP" "$OTA_REQUESTOR_APP"
 
 if cmp "$OTA_DOWNLOAD_PATH" "$FIRMWARE_BIN"; then
     echo Test passed && exit 0