diff --git a/tools/test.mk b/tools/test.mk
index 70013925..743ef127 100644
--- a/tools/test.mk
+++ b/tools/test.mk
@@ -52,10 +52,10 @@ test-update: test-app/image.bin FORCE
 		(make test-reset && sleep 1 && st-flash --reset write test-update.bin 0x08040000)
 
 test-self-update: wolfboot.bin test-app/image.bin FORCE
-	mv $(PRIVATE_KEY) private_key.old
+	@mv $(PRIVATE_KEY) private_key.old
 	@make clean
 	@rm src/*_pub_key.c
-	@make factory.bin RAM_CODE=1 WOLFBOOT_VERSION=$(WOLFBOOT_VERSION)
+	@make factory.bin RAM_CODE=1 WOLFBOOT_VERSION=$(WOLFBOOT_VERSION) SIGN=$(SIGN)
 	@$(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
 	@st-flash --reset write test-app/image_v2_signed.bin 0x08020000 || \
 		(make test-reset && sleep 1 && st-flash --reset write test-app/image_v2_signed.bin 0x08020000) || \
@@ -218,18 +218,25 @@ test-23-rollback-SPI: $(EXPVER) FORCE
 	@echo TEST PASSED
 
 test-34-forward-self-update: $(EXPVER) FORCE
-	@make test-erase-ext
 	@echo Creating and uploading factory image...
-	@make test-factory RAM_CODE=1
+	@make clean
+	@make distclean
+	@make test-factory RAM_CODE=1 SIGN=$(SIGN)
 	@echo Expecting version '1'
 	@$$(test `$(EXPVER)` -eq 1)
 	@echo
 	@echo Updating keys, firmware, bootloader
-	@make test-self-update WOLFBOOT_VERSION=4 RAM_CODE=1 
+	@make test-self-update WOLFBOOT_VERSION=4 RAM_CODE=1 SIGN=$(SIGN)
 	@sleep 2
 	@$$(test `$(EXPVER)` -eq 2)
 	@make clean
 	@echo TEST PASSED
 
+test-44-forward-self-update-ECC: $(EXPVER) FORCE
+	@make test-34-forward-self-update SIGN=ECC256
 
-test-all: clean test-01-forward-update-no-downgrade test-02-forward-update-allow-downgrade test-03-rollback test-11-forward-update-no-downgrade-ECC test-13-rollback-ECC test-21-forward-update-no-downgrade-SPI test-23-rollback-SPI test-34-forward-self-update
+
+test-all: clean test-01-forward-update-no-downgrade test-02-forward-update-allow-downgrade test-03-rollback \
+	test-11-forward-update-no-downgrade-ECC test-13-rollback-ECC test-21-forward-update-no-downgrade-SPI test-23-rollback-SPI \
+	test-34-forward-self-update \
+	test-44-forward-self-update-ECC