diff --git a/samples/zephyr/README.md b/samples/zephyr/README.md
index b19a0a9..d65341e 100644
--- a/samples/zephyr/README.md
+++ b/samples/zephyr/README.md
@@ -1,6 +1,6 @@
 # Zephyr sample application.
 
-In order to successfully deploy an application using mcuboot, it is
+In order to successfully deploy an application using MCUboot, it is
 necessary to build at least one other binary: the application itself.
 It is beyond the scope of this documentation to describe what an
 application is able to do, however a working example is certainly
diff --git a/samples/zephyr/overlay-ecdsa-p256.conf b/samples/zephyr/overlay-ecdsa-p256.conf
index 8555816..8bf9512 100644
--- a/samples/zephyr/overlay-ecdsa-p256.conf
+++ b/samples/zephyr/overlay-ecdsa-p256.conf
@@ -1,3 +1,4 @@
 # Kconfig overlay for building with ECDSA-P256 signatures
 CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y
 CONFIG_BOOT_SIGNATURE_KEY_FILE="root-ec-p256.pem"
+CONFIG_BOOT_SWAP_USING_MOVE=y
diff --git a/samples/zephyr/overlay-rsa.conf b/samples/zephyr/overlay-rsa.conf
index 539e779..c70349d 100644
--- a/samples/zephyr/overlay-rsa.conf
+++ b/samples/zephyr/overlay-rsa.conf
@@ -1,2 +1,3 @@
 # Kconfig overlay for building with RSA signatures
 CONFIG_BOOT_SIGNATURE_TYPE_RSA=y
+CONFIG_BOOT_SWAP_USING_MOVE=y
diff --git a/samples/zephyr/overlay-skip-primary-slot-validate.conf b/samples/zephyr/overlay-skip-primary-slot-validate.conf
index e94518e..e0c1f98 100644
--- a/samples/zephyr/overlay-skip-primary-slot-validate.conf
+++ b/samples/zephyr/overlay-skip-primary-slot-validate.conf
@@ -1,3 +1,4 @@
 # Kconfig overlay for building without validating primary slot.
 
 # CONFIG_BOOT_VALIDATE_SLOT0 is not set
+CONFIG_BOOT_SWAP_USING_MOVE=y
diff --git a/samples/zephyr/run-tests.sh b/samples/zephyr/run-tests.sh
index e2e4a9c..cdd89e3 100755
--- a/samples/zephyr/run-tests.sh
+++ b/samples/zephyr/run-tests.sh
@@ -1,196 +1,4 @@
 #!/bin/bash
 
-# Test runner
-#
-# Copyright (c) 2017 Open Source Foundries Limited
-
-#
-# This script can be used to execute the Zephyr test plan detailed in
-# docs/testplan-zephyr.md.
-#
-
-function ok_yn () {
-    while true ; do
-        read -p "Test result OK (y/n)? " -n 1 choice
-        echo
-        case "$choice" in
-            y|Y )
-                return
-                ;;
-            n|N )
-                echo "Test failed; exiting"
-                exit 1
-                ;;
-            * )
-                echo Please enter y or n
-                ;;
-        esac
-    done
-}
-
-set -e
-
-echo '--------------------------------------------------------'
-echo '------------------------ GOOD RSA ----------------------'
-make test-good-rsa
-pyocd erase --chip
-echo "Flashing bootloader"
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello2 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello1 runs"
-ok_yn
-
-echo '--------------------------------------------------------'
-echo '------------------------ GOOD ECDSA --------------------'
-make test-good-ecdsa
-pyocd erase --chip
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello2 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello1 runs"
-ok_yn
-
-echo '--------------------------------------------------------'
-echo '------------------------ OVERWRITE ---------------------'
-make test-overwrite
-pyocd erase --chip
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello2 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello2 runs"
-ok_yn
-
-echo '--------------------------------------------------------'
-echo '------------------------ BAD RSA -----------------------'
-make test-bad-rsa-upgrade
-pyocd erase --chip
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello1 runs"
-ok_yn
-
-echo '--------------------------------------------------------'
-echo '------------------------ BAD ECDSA ---------------------'
-make test-bad-ecdsa-upgrade
-pyocd erase --chip
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello1 runs"
-ok_yn
-
-echo '--------------------------------------------------------'
-echo '------------------------ NO BOOTCHECK ------------------'
-make test-no-bootcheck
-pyocd erase --chip
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello1 runs"
-ok_yn
-
-echo '--------------------------------------------------------'
-echo '------------------------ WRONG RSA ---------------------'
-make test-wrong-rsa
-pyocd erase --chip
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello1 runs"
-ok_yn
-
-echo '--------------------------------------------------------'
-echo '------------------------ WRONG ECDSA -------------------'
-make test-wrong-ecdsa
-pyocd erase --chip
-make flash_boot
-echo "Expected result: unable to find bootable image"
-ok_yn
-echo "Flashing hello 1"
-make flash_hello1
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Flashing hello 2"
-make flash_hello2
-echo "Expected result: hello1 runs"
-ok_yn
-echo "Resetting"
-pyocd commander -c reset
-echo "Expected result: hello1 runs"
-ok_yn
-
-echo '========================================================'
-echo '                    ALL TESTS PASSED'
-echo '========================================================'
+echo "Please use the new test runner:  go run run-tests.go"
+exit 1