diff --git a/tests/riotboot/Makefile b/tests/riotboot/Makefile
index 0ac80123244458322a9470f0417a7a323d9bca87..bbc57adf1316e861e8b5c8bdbe1d5dfe3e0f2b09 100644
--- a/tests/riotboot/Makefile
+++ b/tests/riotboot/Makefile
@@ -18,17 +18,15 @@ DEVELHELP ?= 1
 # Change this to 0 show compiler invocation lines by default:
 QUIET ?= 1
 
-all: riotboot
+# Target 'all' will generate the combined file directly.
+# It also makes 'flash' and 'flash-only' work without specific command.
+FLASHFILE = $(RIOTBOOT_COMBINED_BIN)
 
 include ../Makefile.tests_common
 include $(RIOTBASE)/Makefile.include
 
-# Make 'flash' and 'flash-only' work without specific command.
-# This is currently hacky as there is no way of specifiying a FLASHFILE
-all: riotboot/combined-slot0
+# This is currently hacky as the flasher are not using 'FLASHFILE'
 # openocd
-ELFFILE = $(RIOTBOOT_COMBINED_BIN)
+ELFFILE = $(FLASHFILE)
 # edbg
-HEXFILE = $(RIOTBOOT_COMBINED_BIN)
-# murdock uses ':=' to get the flashfile variable so should also be overwritten
-FLASHFILE = $(RIOTBOOT_COMBINED_BIN)
+HEXFILE = $(FLASHFILE)