diff --git a/tests/riotboot/Makefile b/tests/riotboot/Makefile
index c4b90fa4e37902fbb9797527daa8baf38c1d5798..0ac80123244458322a9470f0417a7a323d9bca87 100644
--- a/tests/riotboot/Makefile
+++ b/tests/riotboot/Makefile
@@ -27,8 +27,8 @@ include $(RIOTBASE)/Makefile.include
 # This is currently hacky as there is no way of specifiying a FLASHFILE
 all: riotboot/combined-slot0
 # openocd
-ELFFILE = $(BINDIR_APP)-slot0-combined.bin
+ELFFILE = $(RIOTBOOT_COMBINED_BIN)
 # edbg
-HEXFILE = $(BINDIR_APP)-slot0-combined.bin
+HEXFILE = $(RIOTBOOT_COMBINED_BIN)
 # murdock uses ':=' to get the flashfile variable so should also be overwritten
-FLASHFILE = $(BINDIR_APP)-slot0-combined.bin
+FLASHFILE = $(RIOTBOOT_COMBINED_BIN)