diff --git a/inlet/bmp/root_test.go b/inlet/bmp/root_test.go
index c12d974b..aacbeb15 100644
--- a/inlet/bmp/root_test.go
+++ b/inlet/bmp/root_test.go
@@ -109,10 +109,10 @@ func TestBMP(t *testing.T) {
 		if diff := helpers.Diff(gotMetrics, expectedMetrics); diff != "" {
 			t.Errorf("Metrics (-got, +want):\n%s", diff)
 		}
-		for i := 0; i < 100; i++ {
+		for i := 0; ; i++ {
 			if _, err := conn.Write([]byte{1}); err != nil {
 				break
-			} else if err == nil && i == 99 {
+			} else if i >= 200 {
 				t.Fatal("Write() did not error while connection should be closed")
 			}
 			time.Sleep(5 * time.Millisecond)
diff --git a/inlet/bmp/serve.go b/inlet/bmp/serve.go
index 19b3d265..116ee457 100644
--- a/inlet/bmp/serve.go
+++ b/inlet/bmp/serve.go
@@ -34,8 +34,7 @@ func (c *Component) serveConnection(conn *net.TCPConn) error {
 		case <-c.t.Dying():
 			// No need to clean up
 		}
-		conn.CloseWrite()
-		conn.CloseRead()
+		conn.Close()
 		c.metrics.closedConnections.WithLabelValues(exporterStr).Inc()
 		return nil
 	})