diff --git a/dist/testbed-support/Makefile.iotlab b/dist/testbed-support/Makefile.iotlab
index 4ddf9b7120..b1faf643b0 100644
--- a/dist/testbed-support/Makefile.iotlab
+++ b/dist/testbed-support/Makefile.iotlab
@@ -1,13 +1,15 @@
 .PHONY: iotlab-auth iotlab-exp iotlab-flash iotlab-reset iotlab-term
 
-IOTLAB_NODES    ?= 5
-IOTLAB_DURATION ?= 30
-IOTLAB_SITE     ?= grenoble
-IOTLAB_TYPE     ?= m3:at86rf231
-IOTLAB_AUTH     ?= $(HOME)/.iotlabrc
-IOTLAB_USER     ?= $(shell cut -f1 -d: $(IOTLAB_AUTH))
-IOTLAB_EXP_ID   ?= $(shell experiment-cli get -l --state Running | grep -m 1 '"id"' | grep -Eo '[[:digit:]]+')
-IOTLAB_EXP_NAME ?= RIOT_EXP
+IOTLAB_NODES        ?= 5
+IOTLAB_DURATION     ?= 30
+IOTLAB_SITE         ?= grenoble
+IOTLAB_TYPE         ?= m3:at86rf231
+IOTLAB_AUTH         ?= $(HOME)/.iotlabrc
+IOTLAB_USER         ?= $(shell cut -f1 -d: $(IOTLAB_AUTH))
+IOTLAB_EXP_ID       ?= $(shell experiment-cli get -l --state Running | grep -m 1 '"id"' | grep -Eo '[[:digit:]]+')
+IOTLAB_EXP_NAME     ?= RIOT_EXP
+
+IOTLAB_AUTHORITY    := "$(IOTLAB_USER)@$(IOTLAB_SITE).iot-lab.info"
 
 ifneq (,$(findstring m3,$(IOTLAB_TYPE)))
 	BINARY := $(ELFFILE)
@@ -42,5 +44,5 @@ iotlab-reset: $(IOTLAB_AUTH)
 	$(AD)node-cli --reset -i $(IOTLAB_EXP_ID)
 
 iotlab-term:
-	$(AD)ssh -t $(IOTLAB_USER)@$(IOTLAB_SITE).iot-lab.info "test -f ~/.iotlabrc || auth-cli -u $(IOTLAB_USER)"
-	$(AD)ssh -t $(IOTLAB_USER)@$(IOTLAB_SITE).iot-lab.info "serial_aggregator -i $(IOTLAB_EXP_ID)"
+	$(AD)ssh -t $(IOTLAB_AUTHORITY) "test -f ~/.iotlabrc || auth-cli -u $(IOTLAB_USER)"
+	$(AD)ssh -t $(IOTLAB_AUTHORITY) "serial_aggregator -i $(IOTLAB_EXP_ID)"