diff --git a/ci.sh b/ci.sh
index db00c406..43f09373 100755
--- a/ci.sh
+++ b/ci.sh
@@ -155,7 +155,7 @@ cargo batch  \
     --- build --release --manifest-path examples/boot/application/stm32l1/Cargo.toml --target thumbv7m-none-eabi --features skip-include --out-dir out/examples/boot/stm32l1 \
     --- build --release --manifest-path examples/boot/application/stm32l4/Cargo.toml --target thumbv7em-none-eabi --features skip-include --out-dir out/examples/boot/stm32l4 \
     --- build --release --manifest-path examples/boot/application/stm32wl/Cargo.toml --target thumbv7em-none-eabihf --features skip-include --out-dir out/examples/boot/stm32wl \
-    --- build --release --manifest-path examples/boot/bootloader/nrf/Cargo.toml --target thumbv7em-none-eabi --features embassy-nrf/nrf52840 \
+    --- build --release --manifest-path examples/boot/bootloader/nrf/Cargo.toml --target thumbv7em-none-eabi --features embassy-nrf/nrf52840 --out-dir out/examples/bootloader/nrf \
     --- build --release --manifest-path examples/boot/bootloader/nrf/Cargo.toml --target thumbv8m.main-none-eabihf --features embassy-nrf/nrf9160-ns \
     --- build --release --manifest-path examples/boot/bootloader/rp/Cargo.toml --target thumbv6m-none-eabi \
     --- build --release --manifest-path examples/boot/bootloader/stm32/Cargo.toml --target thumbv7em-none-eabi --features embassy-stm32/stm32wl55jc-cm4 \
@@ -171,6 +171,7 @@ cargo batch  \
     --- build --release --manifest-path tests/stm32/Cargo.toml --target thumbv7em-none-eabi --features stm32u585ai --out-dir out/tests/stm32u585ai \
     --- build --release --manifest-path tests/rp/Cargo.toml --target thumbv6m-none-eabi --out-dir out/tests/rpi-pico \
     --- build --release --manifest-path tests/nrf/Cargo.toml --target thumbv7em-none-eabi --out-dir out/tests/nrf52840-dk \
+    --- build --release --manifest-path tests/boot/nrf/Cargo.toml --target thumbv7em-none-eabi --out-dir out/tests/boot/nrf52840-dk \
     --- build --release --manifest-path tests/riscv32/Cargo.toml --target riscv32imac-unknown-none-elf \
     $BUILD_EXTRA
 
diff --git a/tests/boot/nrf/.cargo/config.toml b/tests/boot/nrf/.cargo/config.toml
new file mode 100644
index 00000000..03995f96
--- /dev/null
+++ b/tests/boot/nrf/.cargo/config.toml
@@ -0,0 +1,9 @@
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+#runner = "teleprobe local run --chip nRF52840_xxAA --elf"
+runner = "teleprobe client run"
+
+[build]
+target = "thumbv7em-none-eabi"
+
+[env]
+DEFMT_LOG = "trace"
diff --git a/tests/boot/nrf/Cargo.toml b/tests/boot/nrf/Cargo.toml
new file mode 100644
index 00000000..62bc84c7
--- /dev/null
+++ b/tests/boot/nrf/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+edition = "2021"
+name = "embassy-nrf-boot-tests"
+version = "0.1.0"
+license = "MIT OR Apache-2.0"
+
+[dependencies]
+teleprobe-meta = "1"
+
+embassy-futures = { version = "0.1.0", path = "../../../embassy-futures" }
+embassy-sync = { version = "0.2.0", path = "../../../embassy-sync", features = ["defmt", "nightly"] }
+embassy-executor = { version = "0.3.0", path = "../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "nightly", "integrated-timers"] }
+embassy-time = { version = "0.1.3", path = "../../../embassy-time", features = ["defmt", "nightly", "unstable-traits", "defmt-timestamp-uptime"] }
+embassy-nrf = { version = "0.1.0", path = "../../../embassy-nrf", features = ["defmt", "nightly", "unstable-traits", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] }
+embedded-io-async = { version = "0.5.0" }
+embedded-hal-async = { version = "1.0.0-rc.1" }
+embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] }
+static_cell = { version = "1.1", features = [ "nightly" ] }
+
+defmt = "0.3"
+defmt-rtt = "0.4"
+
+cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
+cortex-m-rt = "0.7.0"
+panic-probe = { version = "0.3", features = ["print-defmt"] }
diff --git a/tests/boot/nrf/build.rs b/tests/boot/nrf/build.rs
new file mode 100644
index 00000000..2089267a
--- /dev/null
+++ b/tests/boot/nrf/build.rs
@@ -0,0 +1,17 @@
+use std::error::Error;
+use std::path::PathBuf;
+use std::{env, fs};
+
+fn main() -> Result<(), Box<dyn Error>> {
+    let out = PathBuf::from(env::var("OUT_DIR").unwrap());
+    fs::write(out.join("memory.x"), include_bytes!("memory.x")).unwrap();
+    println!("cargo:rustc-link-search={}", out.display());
+    println!("cargo:rerun-if-changed=memory.x");
+
+    println!("cargo:rustc-link-arg-bins=--nmagic");
+    println!("cargo:rustc-link-arg-bins=-Tmemory.x");
+    println!("cargo:rustc-link-arg-bins=-Tdefmt.x");
+    println!("cargo:rustc-link-arg-bins=-Tteleprobe.x");
+
+    Ok(())
+}
diff --git a/tests/boot/nrf/memory.x b/tests/boot/nrf/memory.x
new file mode 100644
index 00000000..5ee9a523
--- /dev/null
+++ b/tests/boot/nrf/memory.x
@@ -0,0 +1,20 @@
+MEMORY
+{
+  /* NOTE 1 K = 1 KiBi = 1024 bytes */
+  BOOTLOADER                        : ORIGIN = 0x00000000, LENGTH = 24K
+  BOOTLOADER_STATE                  : ORIGIN = 0x00006000, LENGTH = 4K
+  FLASH                             : ORIGIN = 0x00007000, LENGTH = 64K
+  DFU                               : ORIGIN = 0x00017000, LENGTH = 68K
+  TESTSTATE                         : ORIGIN = 0x00028000, LENGTH = 4K
+  RAM                         (rwx) : ORIGIN = 0x20000000, LENGTH = 32K
+}
+
+__bootloader_state_start = ORIGIN(BOOTLOADER_STATE);
+__bootloader_state_end = ORIGIN(BOOTLOADER_STATE) + LENGTH(BOOTLOADER_STATE);
+
+__bootloader_dfu_start = ORIGIN(DFU);
+__bootloader_dfu_end = ORIGIN(DFU) + LENGTH(DFU);
+
+
+__teststate_start = ORIGIN(TESTSTATE);
+__teststate_end = ORIGIN(TESTSTATE) + LENGTH(TESTSTATE);
diff --git a/tests/boot/nrf/src/bin/update_success.rs b/tests/boot/nrf/src/bin/update_success.rs
new file mode 100644
index 00000000..60e11452
--- /dev/null
+++ b/tests/boot/nrf/src/bin/update_success.rs
@@ -0,0 +1,55 @@
+#![no_std]
+#![no_main]
+#![feature(type_alias_impl_trait)]
+teleprobe_meta::target!(b"nrf52840-dk");
+
+#[path = "../common.rs"]
+mod common;
+use common::*;
+
+use embassy_boot_nrf::{FirmwareUpdater, FirmwareUpdaterConfig};
+use embassy_embedded_hal::adapter::BlockingAsync;
+use embassy_executor::Spawner;
+use embassy_nrf::gpio::{Input, Level, Output, OutputDrive, Pull};
+use embassy_nrf::nvmc::Nvmc;
+use embassy_nrf::wdt::{self, Watchdog};
+use embassy_sync::mutex::Mutex;
+use panic_reset as _;
+
+#[embassy_executor::main]
+async fn main(_spawner: Spawner) {
+    let p = embassy_nrf::init(Default::default());
+
+    let wdt_config = wdt::Config::try_new(&p.WDT).unwrap();
+    let (_wdt, [_wdt_handle]) = match Watchdog::try_new(p.WDT, wdt_config) {
+        Ok(x) => x,
+        Err(_) => {
+            // Watchdog already active with the wrong number of handles, waiting for it to timeout...
+            loop {
+                cortex_m::asm::wfe();
+            }
+        }
+    };
+
+    let nvmc = Nvmc::new(p.NVMC);
+    let nvmc = Mutex::new(BlockingAsync::new(nvmc));
+
+    let test_state = Partition::new(&mut )
+    let config = FirmwareUpdaterConfig::from_linkerfile(&nvmc);
+    let mut magic = [0; 4];
+    let mut updater = FirmwareUpdater::new(config, &mut magic);
+
+    // Check state if we've attempted update yet
+    let dfu = updater.prepare().await.unwrap();
+
+    let mut offset = 0;
+    for chunk in APP_B.chunks(4096) {
+        let mut buf: [u8; 4096] = [0; 4096];
+        buf[..chunk.len()].copy_from_slice(chunk);
+        updater.write_firmware(offset, &buf).await.unwrap();
+        offset += chunk.len();
+    }
+    updater.mark_updated().await.unwrap();
+    led.set_high();
+    cortex_m::peripheral::SCB::sys_reset();
+}
diff --git a/tests/boot/nrf/src/common.rs b/tests/boot/nrf/src/common.rs
new file mode 100644
index 00000000..2f01f57d
--- /dev/null
+++ b/tests/boot/nrf/src/common.rs
@@ -0,0 +1,12 @@
+#![macro_use]
+
+#[allow(unused)]
+pub use defmt::*;
+use embassy_embedded_hal::flash::partition::asynch::Partition;
+use embassy_nrf::nvmc::Nvmc;
+use embassy_sync::blocking_mutex::raw::NoopRawMutex;
+use {defmt_rtt as _, panic_probe as _};
+
+pub struct TestState<'a> {
+    flash: Partition<'a, NoopRawMutex, Nvmc<'a>>,
+}