diff --git a/arch/arm/src/nrf53/CMakeLists.txt b/arch/arm/src/nrf53/CMakeLists.txt
index a77e337244523..b2ed1229775bc 100644
--- a/arch/arm/src/nrf53/CMakeLists.txt
+++ b/arch/arm/src/nrf53/CMakeLists.txt
@@ -60,7 +60,7 @@ if(CONFIG_NRF53_IPC)
   list(APPEND SRCS nrf53_ipc.c)
 endif()
 
-if(CONFIG_NRF53_RPTUN)
+if(CONFIG_RPTUN)
   list(APPEND SRCS nrf53_rptun.c)
 endif()
 
diff --git a/tools/ci/testlist/arm-05.dat b/tools/ci/testlist/arm-05.dat
index 73113d72eeb74..a4f4ea374f7a4 100644
--- a/tools/ci/testlist/arm-05.dat
+++ b/tools/ci/testlist/arm-05.dat
@@ -8,13 +8,13 @@
 # Boards build by CMake
 
 CMake,nrf52832-dk:buttons
-# CMake,nrf52832-dk:mcuboot_app
-# CMake,nrf52832-dk:mcuboot_loader
-# CMake,nrf52832-dk:mcuboot_loader_minimal
+CMake,nrf52832-dk:mcuboot_app
+CMake,nrf52832-dk:mcuboot_loader
+CMake,nrf52832-dk:mcuboot_loader_minimal
 CMake,nrf52832-dk:nsh
 CMake,nrf52832-dk:ostest_tickless
-# CMake,nrf52832-dk:sdc
-# CMake,nrf52832-dk:sdc_nimble
+CMake,nrf52832-dk:sdc
+CMake,nrf52832-dk:sdc_nimble
 CMake,nrf52832-dk:wdog
 
 CMake,nrf52832-mdk:nsh
@@ -24,17 +24,17 @@ CMake,nrf52832-sparkfun:nsh
 CMake,nrf52840-dk:adc
 CMake,nrf52840-dk:buttons
 CMake,nrf52840-dk:cdcacm
-# CMake,nrf52840-dk:composite
+CMake,nrf52840-dk:composite
 CMake,nrf52840-dk:highpri
-# CMake,nrf52840-dk:mcuboot_app
-# CMake,nrf52840-dk:mcuboot_loader
+CMake,nrf52840-dk:mcuboot_app
+CMake,nrf52840-dk:mcuboot_loader
 CMake,nrf52840-dk:nsh
 CMake,nrf52840-dk:ostest_tickless
 CMake,nrf52840-dk:pwm
 CMake,nrf52840-dk:qspi
-#CMake,nrf52840-dk:rndis
-# CMake,nrf52840-dk:sdc
-# CMake,nrf52840-dk:sdc_nimble
+CMake,nrf52840-dk:rndis
+CMake,nrf52840-dk:sdc
+CMake,nrf52840-dk:sdc_nimble
 CMake,nrf52840-dk:sx127x
 CMake,nrf52840-dk:timer
 
@@ -51,30 +51,30 @@ CMake,nrf5340-audio-dk:nsh_cpuapp
 
 CMake,nrf5340-dk:adc_cpuapp
 CMake,nrf5340-dk:buttons_cpuapp
-# CMake,nrf5340-dk:composite_cpuapp
-# CMake,nrf5340-dk:mcuboot_app_cpuapp
-# CMake,nrf5340-dk:mcuboot_loader_cpuapp
+CMake,nrf5340-dk:composite_cpuapp
+CMake,nrf5340-dk:mcuboot_app_cpuapp
+CMake,nrf5340-dk:mcuboot_loader_cpuapp
 CMake,nrf5340-dk:nsh_cpuapp
 CMake,nrf5340-dk:nsh_cpunet
 CMake,nrf5340-dk:ostest_tickless_cpuapp
 CMake,nrf5340-dk:pwm_cpuapp
 CMake,nrf5340-dk:qspi_cpuapp
-# CMake,nrf5340-dk:rpmsghci_bt_cpuapp
-# CMake,nrf5340-dk:rpmsghci_nimble_cpuapp
-# CMake,nrf5340-dk:rpmsghci_sdc_cpunet
-# CMake,nrf5340-dk:rptun_cpuapp
-# CMake,nrf5340-dk:rptun_cpunet
-# CMake,nrf5340-dk:sdc_cpunet
-# CMake,nrf5340-dk:sdc_nimble_cpunet
+CMake,nrf5340-dk:rpmsghci_bt_cpuapp
+CMake,nrf5340-dk:rpmsghci_nimble_cpuapp
+CMake,nrf5340-dk:rpmsghci_sdc_cpunet
+CMake,nrf5340-dk:rptun_cpuapp
+CMake,nrf5340-dk:rptun_cpunet
+CMake,nrf5340-dk:sdc_cpunet
+CMake,nrf5340-dk:sdc_nimble_cpunet
 CMake,nrf5340-dk:timer_cpuapp
 
-# CMake,thingy53:composite_cpuapp
+CMake,thingy53:composite_cpuapp
 CMake,thingy53:nsh_cpuapp
 CMake,thingy53:nsh_cpunet
 
-# CMake,nrf9160-dk:mcuboot_app
-# CMake,nrf9160-dk:mcuboot_loader
+CMake,nrf9160-dk:mcuboot_app
+CMake,nrf9160-dk:mcuboot_loader
 CMake,nrf9160-dk:miniboot_s
-# CMake,nrf9160-dk:modem_ns
+CMake,nrf9160-dk:modem_ns
 CMake,nrf9160-dk:nsh
 CMake,nrf9160-dk:ostest_tickless
diff --git a/tools/ci/testlist/arm-12.dat b/tools/ci/testlist/arm-12.dat
index 5e404651b60db..a14484d23b871 100644
--- a/tools/ci/testlist/arm-12.dat
+++ b/tools/ci/testlist/arm-12.dat
@@ -36,8 +36,8 @@ CMake,stm32f777zit6-meadow:nsh
 
 # CMake,nucleo-h743zi:composite
 # CMake,nucleo-h743zi:elf
-# CMake,nucleo-h743zi:mcuboot-app
-# CMake,nucleo-h743zi:mcuboot-loader
+CMake,nucleo-h743zi:mcuboot-app
+CMake,nucleo-h743zi:mcuboot-loader
 CMake,nucleo-h743zi:netnsh
 CMake,nucleo-h743zi:nsh
 # CMake,nucleo-h743zi:nxlines_oled