diff --git a/gossip/gossip.go b/gossip/gossip.go
index 281747252..a41d05065 100644
--- a/gossip/gossip.go
+++ b/gossip/gossip.go
@@ -426,7 +426,13 @@ func (g *eventReceiver) NotifyUpdate(n *memberlist.Node) {
 }
 
 func (g *eventReceiver) Close() {
-	close(g.closed)
+	// TODO workaround to make tests pass. We are going to delete this code anyways.
+	select {
+	case <-g.closed:
+		return
+	default:
+		close(g.closed)
+	}
 }
 
 func (g *eventReceiver) listen() {
diff --git a/test/port/port_mapper.go b/test/port/port_mapper.go
index 94ac32978..a20e868a0 100644
--- a/test/port/port_mapper.go
+++ b/test/port/port_mapper.go
@@ -98,7 +98,7 @@ func (pm *globalPortMapper) allocateAtTop() {
 	pm.availPorts = make([]net.Listener, pm.numPorts)
 	i := 0
 
-	for next := 65000; i < pm.numPorts && next > 0; next-- {
+	for next := 65000; i < pm.numPorts && next > 1000; next-- {
 		lsn, err := net.Listen("tcp", fmt.Sprintf(":%d", next))
 		if err != nil {
 			//fmt.Printf("next=%v, err = %v\n", next+1, err)