diff --git a/config/boards/aml-t95z-plus.tvb b/config/boards/aml-t95z-plus.tvb
index b9b0820b15..fddcf7eee3 100644
--- a/config/boards/aml-t95z-plus.tvb
+++ b/config/boards/aml-t95z-plus.tvb
@@ -5,6 +5,7 @@ BOARDFAMILY="meson-gxl"                         # s912's are actually meson-gxm,
 BOOTCONFIG="meson-gxm-t95z-plus_defconfig"      # patched-in
 BOARD_MAINTAINER=""
 KERNEL_TARGET="edge"
+KERNEL_TEST_TARGET="edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 
diff --git a/config/boards/gateway-gz80x.conf b/config/boards/gateway-gz80x.conf
index e97ffcc12a..439b7dc4fa 100644
--- a/config/boards/gateway-gz80x.conf
+++ b/config/boards/gateway-gz80x.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="meson-axg"
 BOARD_MAINTAINER="pyavitz"
 BOOTCONFIG="alfredsmart_gateway_gz80x_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 BOOTBRANCH_BOARD="tag:v2023.10"
 BOOTPATCHDIR="v2023.10"
 BOOT_FDT_FILE="amlogic/meson-axg-alfredsmart-gateway-gz80x.dtb"
diff --git a/config/boards/jethubj100.conf b/config/boards/jethubj100.conf
index 71707ce752..9c4897d5dd 100644
--- a/config/boards/jethubj100.conf
+++ b/config/boards/jethubj100.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="jethub"
 BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j100_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex"
 [[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 DEFAULT_CONSOLE="serial"
diff --git a/config/boards/jethubj80.conf b/config/boards/jethubj80.conf
index 27e400d4d6..79f8d1bae5 100644
--- a/config/boards/jethubj80.conf
+++ b/config/boards/jethubj80.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="jethub"
 BOARD_MAINTAINER="adeepn"
 BOOTCONFIG="jethub_j80_defconfig"
 KERNEL_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 PACKAGE_LIST_BOARD="libubootenv-tool apparmor rfkill bluetooth bluez bluez-tools python3-pip watchdog python3-serial python3-intelhex python3-intelhex"
 [[ "${RELEASE}" == "jammy" ]] || PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} util-linux-extra"
 DEFAULT_CONSOLE="serial"
diff --git a/config/boards/nanopi-r4s.conf b/config/boards/nanopi-r4s.conf
index 602cb44293..0b0e20ce29 100644
--- a/config/boards/nanopi-r4s.conf
+++ b/config/boards/nanopi-r4s.conf
@@ -4,7 +4,7 @@ BOARDFAMILY="rockchip64" # Used to be rk3399
 BOARD_MAINTAINER="Manouchehri"
 BOOTCONFIG="nanopi-r4s-rk3399_defconfig"
 KERNEL_TARGET="current,edge"
-KERNEL_TEST_TARGET="current,edge"
+KERNEL_TEST_TARGET="current"
 DEFAULT_CONSOLE="serial"
 MODULES_BLACKLIST="rockchipdrm analogix_dp dw_mipi_dsi dw_hdmi gpu_sched lima hantro_vpu panfrost"
 HAS_VIDEO_OUTPUT="no"
diff --git a/config/boards/onecloud.conf b/config/boards/onecloud.conf
index 21539992c9..a7e5abeb4c 100644
--- a/config/boards/onecloud.conf
+++ b/config/boards/onecloud.conf
@@ -3,7 +3,7 @@ BOARD_NAME="OneCloud"
 BOARDFAMILY="meson8b"
 BOARD_MAINTAINER="hzyitc"
 KERNEL_TARGET="current,edge"
-
+KERNEL_TEST_TARGET="current"
 BOOTCONFIG="none"
 BOOTSCRIPT="boot-onecloud.cmd:boot.cmd"
 BOOTENV_FILE="onecloud.txt"
diff --git a/config/boards/orangepione.conf b/config/boards/orangepione.conf
index d88f24adf6..b62bf2ee61 100644
--- a/config/boards/orangepione.conf
+++ b/config/boards/orangepione.conf
@@ -4,6 +4,7 @@ BOARDFAMILY="sun8i"
 BOARD_MAINTAINER="StephenGraf"
 BOOTCONFIG="orangepi_one_defconfig"
 KERNEL_TARGET="legacy,current,edge"
+KERNEL_TEST_TARGET="current"
 
 function post_config_uboot_target__extra_configs_for_orangepi_one() {
 	display_alert "$BOARD" "set dram clock" "info"
diff --git a/config/boards/uefi-arm64.conf b/config/boards/uefi-arm64.conf
index 1df9fb56fa..9a2687b9c0 100644
--- a/config/boards/uefi-arm64.conf
+++ b/config/boards/uefi-arm64.conf
@@ -3,5 +3,5 @@ declare -g BOARD_NAME="UEFI arm64"
 declare -g BOARDFAMILY="uefi-arm64"
 declare -g BOARD_MAINTAINER="rpardini"
 declare -g KERNEL_TARGET="legacy,current,edge"
-
+declare -g KERNEL_TEST_TARGET="current"
 declare -g BOOT_LOGO=desktop
diff --git a/config/boards/uefi-x86.conf b/config/boards/uefi-x86.conf
index bed29f64e2..22fb3217b2 100644
--- a/config/boards/uefi-x86.conf
+++ b/config/boards/uefi-x86.conf
@@ -3,6 +3,6 @@ declare -g BOARD_NAME="UEFI x86"
 declare -g BOARDFAMILY="uefi-x86"
 declare -g BOARD_MAINTAINER="rpardini"
 declare -g KERNEL_TARGET="legacy,current,edge"
+declare -g KERNEL_TEST_TARGET="current"
 declare -g SERIALCON="tty1"
-
 declare -g BOOT_LOGO=desktop
diff --git a/config/boards/z28pro.tvb b/config/boards/z28pro.tvb
index 3d061ce226..2225d74d99 100644
--- a/config/boards/z28pro.tvb
+++ b/config/boards/z28pro.tvb
@@ -5,6 +5,7 @@ BOARD_MAINTAINER=""
 BOOTCONFIG="rock64-rk3328_defconfig"
 BOOT_FDT_FILE="rockchip/rk3328-z28pro.dtb"
 KERNEL_TARGET="current"
+KERNEL_TEST_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"