diff --git a/src/RemoteSerializer.cc b/src/RemoteSerializer.cc
index 0383977de1..9123e99ef4 100644
--- a/src/RemoteSerializer.cc
+++ b/src/RemoteSerializer.cc
@@ -4023,7 +4023,7 @@ bool SocketComm::Listen()
 
 	hints.ai_protocol = IPPROTO_TCP;
 	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG | AI_NUMERICHOST;
+	hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
 
 	char port_str[16];
 	modp_uitoa10(listen_port, port_str);
diff --git a/testing/btest/Baseline/istate.bro-ipv6/recv..stdout b/testing/btest/Baseline/istate.bro-ipv6-socket/recv..stdout
similarity index 100%
rename from testing/btest/Baseline/istate.bro-ipv6/recv..stdout
rename to testing/btest/Baseline/istate.bro-ipv6-socket/recv..stdout
diff --git a/testing/btest/Baseline/istate.bro-ipv6/send..stdout b/testing/btest/Baseline/istate.bro-ipv6-socket/send..stdout
similarity index 100%
rename from testing/btest/Baseline/istate.bro-ipv6/send..stdout
rename to testing/btest/Baseline/istate.bro-ipv6-socket/send..stdout
diff --git a/testing/btest/istate/bro-ipv6.bro b/testing/btest/istate/bro-ipv6-socket.bro
similarity index 88%
rename from testing/btest/istate/bro-ipv6.bro
rename to testing/btest/istate/bro-ipv6-socket.bro
index 6230018636..ae77a42c54 100644
--- a/testing/btest/istate/bro-ipv6.bro
+++ b/testing/btest/istate/bro-ipv6-socket.bro
@@ -1,11 +1,11 @@
 # @TEST-GROUP: comm
 #
-# @TEST-REQUIRES: ifconfig | grep -q "inet6 ::1"
+# @TEST-REQUIRES: ifconfig | grep -q -E "inet6 ::1|inet6 addr: ::1"
 #
 # @TEST-EXEC: btest-bg-run recv bro -b ../recv.bro
 # @TEST-EXEC: btest-bg-run send bro -b ../send.bro
 # @TEST-EXEC: btest-bg-wait -k 20
-# 
+#
 # @TEST-EXEC: btest-diff recv/.stdout
 # @TEST-EXEC: btest-diff send/.stdout
 
@@ -46,6 +46,10 @@ event remote_connection_handshake_done(p: event_peer)
 	{
 	print fmt("handshake done with peer: %s", p$host);
 	event my_event("hello world");
+	}
+
+event remote_connection_closed(p: event_peer)
+	{
 	terminate();
 	}