diff --git a/tbsetup/ptopgen.in b/tbsetup/ptopgen.in
index ec290c2f9f4b1f7308433de181b7e77130709867..0a957ed36a0a510dd6468bdda684ad01d8f2d6f4 100644
--- a/tbsetup/ptopgen.in
+++ b/tbsetup/ptopgen.in
@@ -727,6 +727,7 @@ elsif (! defined($component_name)) {
 		     ($usecontrol ?
 		      "role='ctrlswitch' and nt.isswitch=1" :
 		      "role='testswitch' or role='widearea_switch' or ".
+		      "n.type='external-switch' or ".
 		      "      (role='testnodefoo' and nt.isswitch=1)"));
 
     while (($switch, $uuid, $country, $latitude, $longitude, $protocols) =