--- AnyEvent/t/handle/04_listen.t	2008/05/17 21:08:05	1.9
+++ AnyEvent/t/handle/04_listen.t	2008/05/23 17:47:06	1.12
@@ -4,7 +4,8 @@
 
 use AnyEvent::Impl::Perl;
 use AnyEvent::Handle;
-use AnyEvent::Util;
+use AnyEvent::Socket;
+use AnyEvent;
 
 my $lbytes;
 my $rbytes;
@@ -16,7 +17,7 @@
 my $hdl;
 my $port;
 
-my $w = AnyEvent::Util::tcp_server undef, undef,
+my $w = tcp_server undef, undef,
    sub {
       my ($fh, $host, $port) = @_;
 
@@ -41,8 +42,9 @@
 
 
 my $clhdl;
-my $wc = AnyEvent::Util::tcp_connect localhost => $port, sub {
-   my ($fh) = @_;
+my $wc = tcp_connect localhost => $port, sub {
+   my ($fh) = @_
+      or die "connect: $!";
 
    $clhdl = AnyEvent::Handle->new (fh => $fh, on_eof => sub { $cv->broadcast });