diff --git a/Makefile.include b/Makefile.include
index f02da86641..944bed33fa 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -347,10 +347,8 @@ export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-)
 # be done in makefile.iotlab.single.inc.mk which is included after.
 ifneq (,$(IOTLAB_NODE))
   PROGRAMMER ?= iotlab
-  # iotlab uses ELFFILE by default for flashing boards, except for WSN430.
-  ifeq (,$(filter wsn430-%,$(BOARD)))
-    FLASHFILE ?= $(ELFFILE)
-  endif
+  # iotlab uses ELFFILE by default for flashing boards.
+  FLASHFILE ?= $(ELFFILE)
 endif
 
 # Add standard include directories
@@ -893,7 +891,7 @@ endif
 help:
 	@$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\):.*/\1/p' | sort | uniq
 
-ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
+ifeq (iotlab-m3,$(BOARD))
   ifneq (,$(filter iotlab-%,$(MAKECMDGOALS)))
     include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab
   endif