diff --git a/mod_for_factory_scripts/400configAutotest b/mod_for_factory_scripts/400configAutotest
index 360a7e0cd7..5eb3b86a40 100755
--- a/mod_for_factory_scripts/400configAutotest
+++ b/mod_for_factory_scripts/400configAutotest
@@ -6,12 +6,15 @@
 
 echo "Create global_config.ini in autotest directory."
 
-pushd ${STATEFUL_DIR}
+GLOBAL_CONFIG="${STATEFUL_DIR}/home/autotest-client/global_config.ini"
 
-cat > ${STATEFUL_DIR}/home/autotest-client/global_config.ini <<EOF
+if [ -f "${GLOBAL_CONFIG}" ]; then
+  echo -e "File ${GLOBAL_CONFIG} already exists."
+  exit 1
+fi
+
+cat > "${GLOBAL_CONFIG}" <<EOF
 [CLIENT]
 drop_caches: False
 drop_caches_between_iterations: False
 EOF
-
-popd
diff --git a/mod_for_factory_scripts/500copyQualDb b/mod_for_factory_scripts/500copyQualDb
index b6977ba602..b75932b2ac 100755
--- a/mod_for_factory_scripts/500copyQualDb
+++ b/mod_for_factory_scripts/500copyQualDb
@@ -11,6 +11,9 @@
 # QUALDB can be a full path of the file, or a specified directory
 # /tmp/run_remote_tests.XXXX, or a default wildcard one /tmp/run_remote_tests.*.
 
+COMPONENTS_FILE="${STATEFUL_DIR}/usr/local/autotest/site_tests/"\
+"hardware_Components/qualified_components"
+
 # If QUALDB is a default wildcard directory, try to use the most recent one.
 QUALDB=$(ls -dt ${QUALDB} 2>&-| head -1)
 
@@ -22,9 +25,7 @@ fi
 if [ ! -z ${QUALDB} ] && [ -f ${QUALDB} ]; then
   # Copy the qualified component file to the image
   echo "Copying ${QUALDB} to the image."
-  mkdir -p ${ROOT_FS_DIR}/usr/local/manufacturing
-  cp -f ${QUALDB} \
-    ${ROOT_FS_DIR}/usr/local/manufacturing/qualified_components
+  cp -f ${QUALDB} ${COMPONENTS_FILE}
 else
   echo "No qualified component file found at: ${QUALDB}"
 fi