diff --git a/Makefile b/Makefile
index 51ef925..9e0694b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ vet: fmt
 	go vet ./...
 
 test: build
-	go test -count=1 ./...
+	go test -count=1 ${TESTFLAGS} ./...
 
 build: generate vet
 	mkdir -p bin
diff --git a/pkg/server/admin/admin_test.go b/pkg/server/admin/admin_test.go
index f39b9b7..732cb90 100644
--- a/pkg/server/admin/admin_test.go
+++ b/pkg/server/admin/admin_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/goleak"
 	"io"
-	"log"
 	"net"
 	"net/http"
 	"strings"
@@ -272,7 +271,6 @@ func (s *AdminTestSuite) connectClientToAgent(
 		return nil, err
 	}
 
-	log.Println("Got agentToServerYamux")
 	serverToAgentYamux := clientConn.agentConnection
 
 	// Now first test the communication from server to agent over the just established connection
@@ -361,9 +359,7 @@ func (s *AdminTestSuite) connectClient(publicId string, serverToClientRW io.Read
 
 func (s *AdminTestSuite) clientConnection(clientId models.ClientId, listener *testsupport.TestAgentListener) (net.Conn, error) {
 	// agent
-	log.Printf("clientConnection: Getting connection for %v", clientId)
 	agentToServerYamux, err := listener.GetConnection(string(clientId))
-	log.Printf("clientConnection: Got connection %v for client %v", agentToServerYamux, clientId)
 	s.Nil(err)
 	return agentToServerYamux, err
 }
diff --git a/pkg/testsupport/listener.go b/pkg/testsupport/listener.go
index a87c578..d028dce 100644
--- a/pkg/testsupport/listener.go
+++ b/pkg/testsupport/listener.go
@@ -3,7 +3,6 @@ package testsupport
 import (
 	"context"
 	"errors"
-	"log"
 	"net"
 	"sync"
 )
@@ -32,8 +31,7 @@ func NewTestListener(ctx context.Context, listener net.Listener) *TestAgentListe
 
 	go func() {
 		for {
-			conn, err := res.Accept()
-			log.Printf("testlistener: Got connection %v %v", conn, err)
+			_, err := res.Accept()
 			if err != nil {
 				return
 			}
@@ -57,11 +55,9 @@ func (l *TestAgentListener) Accept() (net.Conn, error) {
 		return nil, err
 	}
 	localAddr := conn.LocalAddr().String()
-	log.Printf("testlistener: Storing connection %v %v", localAddr, conn)
 	l.mutex.Lock()
 	defer l.mutex.Unlock()
 	l.connections[localAddr] = conn
-	log.Printf("testlistener: broadcasting %v", localAddr)
 	l.cond.Broadcast()
 	return conn, err
 }
@@ -73,15 +69,12 @@ func (l *TestAgentListener) GetConnection(localAddr string) (net.Conn, error) {
 	// at this point in time will not be caught, and if there are no further broadcasts happening, then
 	// the code will hang her.
 	for ok := l.connections[localAddr] != nil; !ok; ok = l.connections[localAddr] != nil {
-		log.Println("Listener cond wait")
 		l.cond.Wait()
-		log.Println("Listener awoken")
 		select {
 		case <-l.ctx.Done():
 			return nil, errors.New("Listenere terminated because context canceled")
 		default:
 		}
 	}
-	log.Printf("Returning connection %v %v", localAddr, l.connections[localAddr])
 	return l.connections[localAddr], nil
 }
diff --git a/pkg/testsupport/utils.go b/pkg/testsupport/utils.go
index fa8eb23..de8fcbf 100644
--- a/pkg/testsupport/utils.go
+++ b/pkg/testsupport/utils.go
@@ -105,7 +105,6 @@ func PrintStackTraces() {
 func BidirectionalConnectionCheck(s *suite.Suite, msg string, clientToServerRW io.ReadWriteCloser, agentToServerYamux io.ReadWriter) {
 	data1 := msg + " -> "
 	data2 := msg + " <- "
-	log.Printf("BIDIRECTIONAL CHECK %v", msg)
 	RunAndWait(
 		s,
 		func() any {