diff --git a/tools/wltests/android/create_aboot_img.sh b/tools/wltests/android/create_aboot_img.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4327086718a66aec428d84efc9a888be7e9d5207
--- /dev/null
+++ b/tools/wltests/android/create_aboot_img.sh
@@ -0,0 +1,144 @@
+#!/bin/bash
+
+################################################################################
+# Internal configurations
+################################################################################
+SCRIPT_DIR=$(dirname $(realpath -s $0))
+BASE_DIR="$SCRIPT_DIR/.."
+source "${BASE_DIR}/helpers"
+source "${DEFINITIONS_PATH}"
+
+DEFAULT_KERNEL="${KERNEL_SRC}/arch/${ARCH}/boot/${KERNEL_IMAGE}"
+KERNEL="${KERNEL:-$DEFAULT_KERNEL}"
+
+DEFAULT_DTB="${KERNEL_SRC}/arch/${ARCH}/boot/dts/${KERNEL_DTB}"
+DTB="${DTB:-$DEFAULT_DTB}"
+
+IMAGE_DTB="${KERNEL_SRC}/arch/${ARCH}/boot/Image-dtb"
+
+DEFAULT_RAMDISK="${PLATFORM_OVERLAY_PATH}/${RAMDISK_IMAGE}"
+RAMDISK="${RAMDISK:-$DEFAULT_RAMDISK}"
+
+DEFAULT_BOOT_IMAGE="${ARTIFACTS_PATH}/${ANDROID_BOOT_IMAGE}"
+BOOT_IMAGE="${BOOT_IMAGE:-$DEFAULT_BOOT_IMAGE}"
+
+DEFAULT_BOOT_IMAGE_CFG="${ARTIFACTS_PATH}/${ANDROID_BOOT_IMAGE_CFG}"
+BOOT_IMAGE_CFG="${BOOT_IMAGE_CFG:-$DEFAULT_BOOT_IMAGE_CFG}"
+
+CMDLINE=${CMDLINE:-$KERNEL_CMDLINE}
+
+if [ ! -f ${KERNEL} ] ; then
+	c_error "KERNEL image not found: ${KERNEL}"
+	exit $ENOENT
+fi
+
+if [ ! -f ${DTB} ] ; then
+	c_error "DTB not found: ${DTB}"
+	exit $ENOENT
+fi
+
+cat "${KERNEL}" "${DTB}" > "${IMAGE_DTB}"
+if [ ! -f ${IMAGE_DTB} ] ; then
+	c_error "Image-dtb not found: ${IMAGE_DTB}"
+	exit $ENOENT
+fi
+
+if [ ! -f ${RAMDISK} ] ; then
+	c_error "RAMDISK image not found: ${RAMDISK}"
+	c_warning "A valid ramdisk image, which matches the device user-space"
+	c_warning "must be deployed by the user under the required path."
+	c_info "Please refer to the ISTALLATION INSTRUCTIONS"
+	c_info "if you don'tknow how to provide such an image."
+	echo
+	exit $ENOENT
+fi
+
+################################################################################
+# Report configuration
+################################################################################
+echo
+c_info "Generate BOOT image:"
+c_info "   $BOOT_IMAGE_CFG"
+c_info "   $BOOT_IMAGE"
+c_info "using this configuration :"
+c_info "  KERNEL                 : $KERNEL"
+c_info "  DTB			 : $DTB"
+c_info "  IMAGE_DTB		 : $IMAGE_DTB"
+c_info "  RAMDISK                : $RAMDISK"
+c_info "  CMDLINE                : $CMDLINE"
+c_info "  ANDROID_IMAGE_BASE     : $ANDROID_IMAGE_BASE"
+c_info "  ANDROID_IMAGE_PAGESIZE : $ANDROID_IMAGE_PAGESIZE"
+c_info "  ANDROID_OS_VERSION     : $ANDROID_OS_VERSION"
+c_info "  ANDROID_OS_PATCH_LEVEL : $ANDROID_OS_PATCH_LEVEL"
+
+# Optional arguments
+if [ "${ANDROID_TAGS_OFFSET}" ]; then
+    c_info "- ANDROID_TAGS_OFFSET    : ${ANDROID_TAGS_OFFSET}"
+    ANDROID_TAGS_OFFSET="tagsaddr = ${ANDROID_TAGS_OFFSET}"
+fi
+
+if [ "${ANDROID_KERNEL_OFFSET}" ]; then
+    c_info "- ANDROID_KERNEL_OFFSET  : ${ANDROID_KERNEL_OFFSET}"
+    ANDROID_KERNEL_OFFSET="kerneladdr = ${ANDROID_KERNEL_OFFSET}"
+fi
+
+if [ "${ANDROID_BOOT_SIZE}" ]; then
+    c_info "- ANDROID_BOOT_SIZE: ${ANDROID_BOOT_SIZE}"
+    ANDROID_BOOT_SIZE="bootsize = ${ANDROID_BOOT_SIZE}"
+fi
+
+if [ "${ANDROID_PAGE_SIZE}" ]; then
+    c_info "- ANDROID_PAGE_SIZE: ${ANDROID_PAGE_SIZE}"
+    ANDROID_PAGE_SIZE="pagesize = ${ANDROID_PAGE_SIZE}"
+fi
+
+if [ "${ANDROID_SECOND_SIZE}" ]; then
+    c_info "- ANDROID_SECOND_SIZE: ${ANDROID_SECOND_SIZE}"
+    ANDROID_SECOND_SIZE="secondaddr = ${ANDROID_SECOND_SIZE}"
+fi
+
+if [ "${ANDROID_RAMDISK_OFFSET}" ]; then
+    c_info "- ANDROID_RAMDISK_OFFSET : ${ANDROID_RAMDISK_OFFSET}"
+    ANDROID_RAMDISK_OFFSET="ramdiskaddr = ${ANDROID_RAMDISK_OFFSET}"
+fi
+
+################################################################################
+# Generate BOOT image
+################################################################################
+
+# Check for abootimg command
+which abootimg &>/dev/null
+if [ $? -ne 0 ]; then
+    cat <<EOF
+
+    ERROR: this script requires the abootimg binary!
+
+    You can install it on Ubuntu systems with:
+        $> sudo apt-get install abootimg
+
+EOF
+    return -1
+fi
+
+# Ensure the output folder exists
+mkdir -p $(dirname $BOOT_IMAGE) &>/dev/null
+
+set -x
+
+# Generate bootimg config file
+cat > "${BOOT_IMAGE_CFG}" << EOL
+    ${ANDROID_BOOT_SIZE}
+    ${ANDROID_PAGE_SIZE}
+    ${ANDROID_KERNEL_OFFSET}
+    ${ANDROID_RAMDISK_OFFSET}
+    ${ANDROID_SECOND_SIZE}
+    ${ANDROID_TAGS_OFFSET}
+    name =
+    cmdline = ${CMDLINE}
+EOL
+
+abootimg --create "${BOOT_IMAGE}" \
+	-k "${IMAGE_DTB}" \
+	-r "${RAMDISK}" \
+	-f "${BOOT_IMAGE_CFG}"
+set +x
diff --git a/tools/wltests/platforms/hikey960_android-4.4/build_images b/tools/wltests/platforms/hikey960_android-4.4/build_images
index c2ae39b2e8820d4c70324b15e472b243d69080e2..c81c5361d59cdf84ce785b121695689ecf1ec370 100755
--- a/tools/wltests/platforms/hikey960_android-4.4/build_images
+++ b/tools/wltests/platforms/hikey960_android-4.4/build_images
@@ -12,9 +12,29 @@ source "${PLATFORM_PATH}/definitions"
 ./build --image --dtbs --silent; ERROR=$?
 [ $ERROR -eq 0 ] || exit $ERROR
 
-./android/create_boot_img.sh; ERROR=$?
-[ $ERROR -eq 0 ] || exit $ERROR
+build_fastboot_image() {
+	./android/create_boot_img.sh; ERROR=$?
+	[ $ERROR -eq 0 ] || exit $ERROR
 
-./android/create_dt_img.sh; ERROR=$?
-[ $ERROR -eq 0 ] || exit $ERROR
+	./android/create_dt_img.sh; ERROR=$?
+	[ $ERROR -eq 0 ] || exit $ERROR
+}
 
+build_uefi_image() {
+	./android/create_aboot_img.sh; ERROR=$?
+	[ $ERROR -eq 0 ] || exit $ERROR
+}
+
+case $BOOTLOADER in
+"fastboot")
+	build_fastboot_image; ERROR=$?
+	;;
+"uefi")
+	build_uefi_image; ERROR=$?
+	;;
+*)
+	c_error "Bootloader $BOOTLOADER not supported"
+	exit $EINVAL
+	;;
+esac
+[ $ERROR -eq 0 ] || exit $ERROR
diff --git a/tools/wltests/platforms/hikey960_android-4.4/definitions b/tools/wltests/platforms/hikey960_android-4.4/definitions
index ddb4677cfa22d22084770aa96246e917166d763d..fb0b4bb2c2f43a99c64d3d6629f51421ba81f0bc 100644
--- a/tools/wltests/platforms/hikey960_android-4.4/definitions
+++ b/tools/wltests/platforms/hikey960_android-4.4/definitions
@@ -29,6 +29,8 @@ ANDROID_TAGS_OFFSET="${ANDROID_TAGS_OFFSET:-0x07A00000}"
 ANDROID_KERNEL_OFFSET="${ANDROID_KERNEL_OFFSET:-0x00080000}"
 ANDROID_RAMDISK_OFFSET="${ANDROID_RAMDISK_OFFSET:-0x07C00000}"
 
+BOOTLOADER=${BOOTLOADER:-fastboot}
+
 ################################################################################
 # Device Tree Configuration
 ################################################################################