diff --git a/go/mysql/fakesqldb/server.go b/go/mysql/fakesqldb/server.go
index d42f21b7007..d4ad5ad9dac 100644
--- a/go/mysql/fakesqldb/server.go
+++ b/go/mysql/fakesqldb/server.go
@@ -425,11 +425,7 @@ func (db *DB) HandleQuery(c *mysql.Conn, query string, callback func(*sqltypes.R
 			userCallback, ok := db.queryPatternUserCallback[pat.expr]
 			db.mu.Unlock()
 			if ok {
-				// Since the user call back can be indefinitely stuck, we shouldn't hold the lock indefinitely.
-				// This is only test code, so no actual cause for concern.
-				db.mu.Unlock()
 				userCallback(query)
-				db.mu.Lock()
 			}
 			if pat.err != "" {
 				return fmt.Errorf(pat.err)
diff --git a/go/vt/vttablet/tabletserver/connpool/dbconn_test.go b/go/vt/vttablet/tabletserver/connpool/dbconn_test.go
index 09264c51203..8d0d0fa7935 100644
--- a/go/vt/vttablet/tabletserver/connpool/dbconn_test.go
+++ b/go/vt/vttablet/tabletserver/connpool/dbconn_test.go
@@ -303,9 +303,10 @@ func TestDBKillWithContext(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	connPool := newPool()
-	connPool.Open(db.ConnParams(), db.ConnParams(), db.ConnParams())
+	params := dbconfigs.New(db.ConnParams())
+	connPool.Open(params, params, params)
 	defer connPool.Close()
-	dbConn, err := newPooledConn(context.Background(), connPool, db.ConnParams())
+	dbConn, err := newPooledConn(context.Background(), connPool, params)
 	if dbConn != nil {
 		defer dbConn.Close()
 	}
@@ -330,9 +331,10 @@ func TestDBKillWithContextDoneContext(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	connPool := newPool()
-	connPool.Open(db.ConnParams(), db.ConnParams(), db.ConnParams())
+	params := dbconfigs.New(db.ConnParams())
+	connPool.Open(params, params, params)
 	defer connPool.Close()
-	dbConn, err := newPooledConn(context.Background(), connPool, db.ConnParams())
+	dbConn, err := newPooledConn(context.Background(), connPool, params)
 	if dbConn != nil {
 		defer dbConn.Close()
 	}
@@ -589,9 +591,10 @@ func TestDBExecOnceKillTimeout(t *testing.T) {
 	db := fakesqldb.New(t)
 	defer db.Close()
 	connPool := newPool()
-	connPool.Open(db.ConnParams(), db.ConnParams(), db.ConnParams())
+	params := dbconfigs.New(db.ConnParams())
+	connPool.Open(params, params, params)
 	defer connPool.Close()
-	dbConn, err := newPooledConn(context.Background(), connPool, db.ConnParams())
+	dbConn, err := newPooledConn(context.Background(), connPool, params)
 	if dbConn != nil {
 		defer dbConn.Close()
 	}