diff --git a/testutils/iotlab.py b/testutils/iotlab.py
index 49d5fdd..7e0c8f3 100644
--- a/testutils/iotlab.py
+++ b/testutils/iotlab.py
@@ -1,4 +1,5 @@
 import logging
+import random
 import re
 
 from iotlabcli.auth import get_user_credentials
@@ -9,6 +10,7 @@
     stop_experiment,
     get_experiment,
     exp_resources,
+    info_experiment,
     AliasNodes,
 )
 
@@ -62,7 +64,7 @@ def board_from_iotlab_node(iotlab_node):
                 "name of format "
                 "<node-name>.<site-name>.iot-lab.info"
             )
-        iotlab_node_name = match.group(1)
+        iotlab_node_name = iotlab_node_name = match.group(1)
         dict_values = IoTLABExperiment.BOARD_ARCHI_MAP.values()
         dict_names = [value['name'] for value in dict_values]
         dict_keys = list(IoTLABExperiment.BOARD_ARCHI_MAP.keys())
@@ -151,6 +153,25 @@ def _wait(self):
         ret = wait_experiment(Api(*self.user_credentials()), self.exp_id)
         return ret
 
+    def _select_random_node(self, site, board):
+        api = Api(*self.user_credentials())
+        info = info_experiment(api, site=site)
+        choices = []
+        for iot_lab_nodes in info.values():
+            if not isinstance(iot_lab_nodes, list):
+                continue
+            for iot_lab_node in iot_lab_nodes:
+                if iot_lab_node.get("state", "") != "Alive":
+                    continue
+                net_addr = iot_lab_node.get("network_address", "")
+                if board not in net_addr:
+                    continue
+                choices.append(net_addr)
+        if not choices:
+            raise RuntimeError(f"No {board} found at {site}")
+        ret = random.choice(choices)
+        return ret
+
     def _submit(self, site, duration):
         """Submit an experiment with required nodes"""
         api = Api(*self.user_credentials())
@@ -159,9 +180,14 @@ def _submit(self, site, duration):
             if ctrl.env.get('IOTLAB_NODE') is not None:
                 resources.append(exp_resources([ctrl.env.get('IOTLAB_NODE')]))
             elif ctrl.board() is not None:
-                board = IoTLABExperiment._archi_from_board(ctrl.board())
-                alias = AliasNodes(1, site, board)
-                resources.append(exp_resources(alias))
+                if ctrl.board() == "iotlab-m3":
+                    board = IoTLABExperiment._archi_from_board(ctrl.board())
+                    alias = AliasNodes(1, site, board)
+                    resources.append(exp_resources(alias))
+                else:
+                    board = IoTLABExperiment.BOARD_ARCHI_MAP[ctrl.board()]['name']
+                    net_addr = self._select_random_node(site, board)
+                    resources.append(exp_resources([net_addr]))
             else:
                 raise ValueError("neither BOARD or IOTLAB_NODE are set")
         return submit_experiment(api, self.name, duration, resources)['id']