anchor.diff:      agent_config(Dir, Transports, Domain, TrapAddr, Versions),
       [{host, Host}, {snmp_versions, Versions}, {ip_version, ipv4}
        | Config];
  -
  +%%
   init_per_group(dual_ip, Config) ->
  -    case os:find_executable("snmpget") of
  -	false ->
  -	    {skip, "snmpget not found"};
  -	Path ->
  +    case find_executables([snmpget, snmptrapd], Config) of
  +	NewConfig when is_list(NewConfig) ->
   	    case ct:require(ipv6_hosts) of
   		ok ->
   		    Dir = ?config(priv_dir, Config),
  +		    Domain = transportDomainUdpIpv4,
  +		    AgentPort = ?config(agent_port, Config),
  +		    ManagerPort = ?config(manager_port, Config),
   		    {ok, Host} = inet:gethostname(),
   		    {ok, IPv4Addr} = inet:getaddr(Host, inet),
   		    {ok, IPv6Addr} = inet:getaddr(Host, inet6),
  -		    Domain = snmpUDPDomain,
   		    Transports =
  -			[{Domain, {IPv4Addr, ?AGENT_PORT}},
  -			 {transportDomainUdpIpv6, {IPv6Addr, ?AGENT_PORT}}],
  -		    TrapAddr = {IPv4Addr, 0},
  +			[{Domain, {IPv4Addr, AgentPort}},
  +			 {transportDomainUdpIpv6, {IPv6Addr, AgentPort}}],
  +		    Targets =
  +			[{Domain, {IPv4Addr, ManagerPort}},
  +			 {transportDomainUdpIpv6, {IPv6Addr, ManagerPort}}],
   		    Versions = [v2],
  -		    agent_config(
  -		      Dir, Transports, Domain, TrapAddr, Versions),
  +		    agent_config(Dir, Transports, Targets, Versions),
   		    [{host, Host}, {port, ?AGENT_PORT},
  -		     {snmp_versions, Versions},
  -		     {snmpget, Path} | Config];
  +		     {snmp_versions, Versions}
  +		     | NewConfig];
   		_ ->
   		    {skip, "Host does not support IPV6"}
  -	    end
  +	    end;
  +	Other ->
  +	    Other
       end;
  -
  +%%
   init_per_group(get, Config) ->
       %% From Ubuntu package snmp
  -    case os:find_executable("snmpget") of
  -	false ->
  -	    {skip, "snmpget not found"};
  -	Path ->
  -	    [{snmpget, Path} | Config]
  -    end;
  -
  +    find_executables([snmpget], Config);
  +%%
   init_per_group(inform, Config) ->
       %% From Ubuntu package snmptrapfmt
  -    case os:find_executable("snmptrapd") of
  -	false ->
  -	    {skip, "snmptrapd not found"};
  -	Path ->
  -	    [{snmptrapd, Path} | Config]
  -    end;
  +    find_executables([snmptrapd], Config);
   init_per_group(_, Config) ->
       Config.
   
  
positive.code: 	 "--disableAuthorization=yes",
  	 "--snmpTrapdAddr=" ++ net_snmp_transport(IPVersion) ++
  	     Host ++ ":" ++ integer_to_list(?config(manager_port, Config))],
      {ok, CheckMP} = re:compile("NET-SNMP version ", [anchored]),
      ProgHandle =
  	start_program(snmptrapd, SnmptrapdArgs, CheckMP, Config),
  
      snmpa:send_notification(
        snmp_master_agent, testTrapv22, {erlang_agent_test, self()}),
  
negative.code:     ].
  
  groups() ->
      [{ipv4, [],
        [{group, get},
         {group, inform}
        ]},
       {ipv6, [],
        [{group, get},
         {group, inform},
         {group, dual_ip}
        ]},
       {get, [],
        [erlang_agent_netsnmp_get]},
       {inform, [],
        [erlang_agent_netsnmp_inform]},
       {dual_ip, [],
        [erlang_agent_dual_ip_get,
         erlang_agent_dual_ip_inform]}
      ].
  
  init_per_suite(Config) ->
  