diff --git a/internal/project/projectservice/project_service_test.go b/internal/project/projectservice/project_service_test.go
index 61df0bb36..8d6f64f5d 100644
--- a/internal/project/projectservice/project_service_test.go
+++ b/internal/project/projectservice/project_service_test.go
@@ -28,7 +28,7 @@ func TestProjectServiceServer_Load(t *testing.T) {
 	lis, stop := testStartProjectServiceServer(t)
 	t.Cleanup(stop)
 
-	_, client := testutils.NewTestGRPCClient(t, lis, projectv1.NewProjectServiceClient)
+	_, client := testutils.NewGRPCClientWithT(t, lis, projectv1.NewProjectServiceClient)
 
 	t.Run("GitProject", func(t *testing.T) {
 		t.Parallel()
@@ -87,7 +87,7 @@ func TestProjectServiceServer_Load_ClientConnClosed(t *testing.T) {
 	lis, stop := testStartProjectServiceServer(t)
 	t.Cleanup(stop)
 
-	clientConn, client := testutils.NewTestGRPCClient(t, lis, projectv1.NewProjectServiceClient)
+	clientConn, client := testutils.NewGRPCClientWithT(t, lis, projectv1.NewProjectServiceClient)
 
 	req := &projectv1.LoadRequest{
 		Kind: &projectv1.LoadRequest_File{
diff --git a/internal/runner/service_test.go b/internal/runner/service_test.go
index d63518777..df7d808e7 100644
--- a/internal/runner/service_test.go
+++ b/internal/runner/service_test.go
@@ -113,7 +113,7 @@ func Test_runnerService(t *testing.T) {
 	lis, stop := testStartRunnerServiceServer(t)
 	t.Cleanup(stop)
 
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv1.NewRunnerServiceClient)
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv1.NewRunnerServiceClient)
 
 	t.Run("Sessions", func(t *testing.T) {
 		t.Parallel()
diff --git a/internal/runnerv2client/client_test.go b/internal/runnerv2client/client_test.go
index ad99a050b..459bfb19f 100644
--- a/internal/runnerv2client/client_test.go
+++ b/internal/runnerv2client/client_test.go
@@ -14,7 +14,7 @@ import (
 	"google.golang.org/grpc/test/bufconn"
 
 	"github.com/stateful/runme/v3/internal/command"
-	"github.com/stateful/runme/v3/internal/runnerv2service"
+	"github.com/stateful/runme/v3/internal/testutils/runnerservice"
 	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
@@ -25,13 +25,14 @@ func init() {
 func TestClient_ExecuteProgram(t *testing.T) {
 	t.Parallel()
 
-	lis, stop := testStartRunnerServiceServer(t)
+	lis, stop := runnerservice.New(t)
 	t.Cleanup(stop)
 
 	t.Run("OutputWithSession", func(t *testing.T) {
 		t.Parallel()
 
-		client := testCreateClient(t, lis)
+		client := createClient(t, lis)
+
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
 
@@ -74,7 +75,8 @@ func TestClient_ExecuteProgram(t *testing.T) {
 	t.Run("InputNonInteractive", func(t *testing.T) {
 		t.Parallel()
 
-		client := testCreateClient(t, lis)
+		client := createClient(t, lis)
+
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 		defer cancel()
 
@@ -104,29 +106,12 @@ func TestClient_ExecuteProgram(t *testing.T) {
 	})
 }
 
-// TODO(adamb): it's copied from internal/runnerv2service.
-func testStartRunnerServiceServer(t *testing.T) (*bufconn.Listener, func()) {
+func createClient(t *testing.T, lis *bufconn.Listener) *Client {
 	t.Helper()
-
 	logger := zaptest.NewLogger(t)
-	factory := command.NewFactory(command.WithLogger(logger))
-
-	server := grpc.NewServer()
-
-	runnerService, err := runnerv2service.NewRunnerService(factory, logger)
-	require.NoError(t, err)
-	runnerv2.RegisterRunnerServiceServer(server, runnerService)
-
-	lis := bufconn.Listen(1024 << 10)
-	go server.Serve(lis)
-
-	return lis, server.Stop
-}
-
-func testCreateClient(t *testing.T, lis *bufconn.Listener) *Client {
 	client, err := New(
 		"passthrough://bufconn",
-		zaptest.NewLogger(t),
+		logger,
 		grpc.WithContextDialer(func(context.Context, string) (net.Conn, error) {
 			return lis.Dial()
 		}),
diff --git a/internal/runnerv2client/client_unix_test.go b/internal/runnerv2client/client_unix_test.go
index 05cf77c44..289aa561a 100644
--- a/internal/runnerv2client/client_unix_test.go
+++ b/internal/runnerv2client/client_unix_test.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/stateful/runme/v3/internal/command"
+	"github.com/stateful/runme/v3/internal/testutils/runnerservice"
 	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 	"github.com/stretchr/testify/require"
 )
@@ -18,10 +19,11 @@ import (
 func TestClient_ExecuteProgram_InputInteractive(t *testing.T) {
 	t.Parallel()
 
-	lis, stop := testStartRunnerServiceServer(t)
+	lis, stop := runnerservice.New(t)
 	t.Cleanup(stop)
 
-	client := testCreateClient(t, lis)
+	client := createClient(t, lis)
+
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 
diff --git a/internal/runnerv2service/service_execute_test.go b/internal/runnerv2service/service_execute_test.go
index 30bd25c79..28739b611 100644
--- a/internal/runnerv2service/service_execute_test.go
+++ b/internal/runnerv2service/service_execute_test.go
@@ -6,50 +6,25 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"net"
 	"os"
 	"path/filepath"
 	"testing"
-	"testing/fstest"
 	"time"
 	"unicode"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/test/bufconn"
 
 	"github.com/stateful/runme/v3/internal/command"
 	"github.com/stateful/runme/v3/internal/command/testdata"
-	"github.com/stateful/runme/v3/internal/config"
-	"github.com/stateful/runme/v3/internal/config/autoconfig"
 	"github.com/stateful/runme/v3/internal/testutils"
 	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 )
 
-func init() {
-	command.SetEnvDumpCommand("env -0")
-
-	// Server uses autoconfig to get necessary dependencies.
-	// One of them, implicit, is [config.Config]. With the default
-	// [config.Loader] it won't be found during testing, so
-	// we need to provide an override.
-	if err := autoconfig.DecorateRoot(func(loader *config.Loader) *config.Loader {
-		fsys := fstest.MapFS{
-			"runme.yaml": {
-				Data: []byte("version: v1alpha1\n"),
-			},
-		}
-		loader.SetConfigRootPath(fsys)
-		return loader
-	}); err != nil {
-		panic(err)
-	}
-}
-
-func Test_conformsOpinionatedEnvVarNaming(t *testing.T) {
+func Test_matchesOpinionatedEnvVarNaming(t *testing.T) {
 	t.Parallel()
 
 	t.Run("valid", func(t *testing.T) {
@@ -85,9 +60,12 @@ func Test_conformsOpinionatedEnvVarNaming(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_Response(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	stream, err := client.Execute(context.Background())
 	require.NoError(t, err)
@@ -156,9 +134,12 @@ func TestRunnerServiceServerExecute_Response(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_MimeType(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	stream, err := client.Execute(context.Background())
 	require.NoError(t, err)
@@ -195,9 +176,12 @@ func TestRunnerServiceServerExecute_MimeType(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_StoreLastStdout(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	sessionResp, err := client.CreateSession(context.Background(), &runnerv2.CreateSessionRequest{})
 	require.NoError(t, err)
@@ -267,14 +251,17 @@ func TestRunnerServiceServerExecute_StoreLastStdout(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_LastStdoutExceedsEnvLimit(t *testing.T) {
+	t.Parallel()
+
 	temp := t.TempDir()
 	fileName := filepath.Join(temp, "large_output.json")
 	_, err := testdata.UngzipToFile(testdata.Users1MGzip, fileName)
 	require.NoError(t, err)
 
-	lis, stop := testStartRunnerServiceServer(t)
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	sessionResp, err := client.CreateSession(context.Background(), &runnerv2.CreateSessionRequest{})
 	require.NoError(t, err)
@@ -344,14 +331,17 @@ func TestRunnerServiceServerExecute_LastStdoutExceedsEnvLimit(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_LargeOutput(t *testing.T) {
+	t.Parallel()
+
 	temp := t.TempDir()
 	fileName := filepath.Join(temp, "large_output.json")
 	_, err := testdata.UngzipToFile(testdata.Users1MGzip, fileName)
 	require.NoError(t, err)
 
-	lis, stop := testStartRunnerServiceServer(t)
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	stream, err := client.Execute(context.Background())
 	require.NoError(t, err)
@@ -383,9 +373,12 @@ func TestRunnerServiceServerExecute_LargeOutput(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_StoreKnownName(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	sessionResp, err := client.CreateSession(context.Background(), &runnerv2.CreateSessionRequest{})
 	require.NoError(t, err)
@@ -456,9 +449,12 @@ func TestRunnerServiceServerExecute_StoreKnownName(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_Configs(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	testCases := []struct {
 		name           string
@@ -613,9 +609,12 @@ func TestRunnerServiceServerExecute_Configs(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_CommandMode_Terminal(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	sessResp, err := client.CreateSession(context.Background(), &runnerv2.CreateSessionRequest{})
 	require.NoError(t, err)
@@ -692,9 +691,12 @@ func TestRunnerServiceServerExecute_CommandMode_Terminal(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_PathEnvInSession(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	sessionResp, err := client.CreateSession(context.Background(), &runnerv2.CreateSessionRequest{})
 	require.NoError(t, err)
@@ -755,11 +757,16 @@ func TestRunnerServiceServerExecute_PathEnvInSession(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_WithInput(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	t.Run("ContinuousInput", func(t *testing.T) {
+		t.Parallel()
+
 		stream, err := client.Execute(context.Background())
 		require.NoError(t, err)
 
@@ -803,6 +810,8 @@ func TestRunnerServiceServerExecute_WithInput(t *testing.T) {
 	})
 
 	t.Run("SimulateCtrlC", func(t *testing.T) {
+		t.Parallel()
+
 		stream, err := client.Execute(context.Background())
 		require.NoError(t, err)
 
@@ -845,6 +854,8 @@ func TestRunnerServiceServerExecute_WithInput(t *testing.T) {
 	})
 
 	t.Run("CloseSendDirection", func(t *testing.T) {
+		t.Parallel()
+
 		stream, err := client.Execute(context.Background())
 		require.NoError(t, err)
 
@@ -872,11 +883,16 @@ func TestRunnerServiceServerExecute_WithInput(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_WithSession(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	t.Run("WithEnvAndMostRecentSessionStrategy", func(t *testing.T) {
+		t.Parallel()
+
 		{
 			stream, err := client.Execute(context.Background())
 			require.NoError(t, err)
@@ -938,9 +954,12 @@ func TestRunnerServiceServerExecute_WithSession(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_WithStop(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	stream, err := client.Execute(context.Background())
 	require.NoError(t, err)
@@ -1005,10 +1024,12 @@ func TestRunnerServiceServerExecute_WithStop(t *testing.T) {
 }
 
 func TestRunnerServiceServerExecute_Winsize(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
 
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	t.Run("DefaultWinsize", func(t *testing.T) {
 		t.Parallel()
@@ -1082,23 +1103,20 @@ func TestRunnerServiceServerExecute_Winsize(t *testing.T) {
 	})
 }
 
-func testStartRunnerServiceServer(t *testing.T) (
-	interface{ Dial() (net.Conn, error) },
-	func(),
-) {
+// Duplicated in testutils/runnerservice/runner_service.go for other packages.
+func startRunnerServiceServer(t *testing.T) (_ *bufconn.Listener, stop func()) {
 	t.Helper()
 
 	logger := zaptest.NewLogger(t)
 	factory := command.NewFactory(command.WithLogger(logger))
 
-	server := grpc.NewServer()
-
-	// Using nop logger to avoid data race.
-	runnerService, err := NewRunnerService(factory, zap.NewNop())
+	runnerService, err := NewRunnerService(factory, logger)
 	require.NoError(t, err)
+
+	server := grpc.NewServer()
 	runnerv2.RegisterRunnerServiceServer(server, runnerService)
 
-	lis := bufconn.Listen(1024 << 10)
+	lis := bufconn.Listen(1 << 20) // 1 MB
 	go server.Serve(lis)
 
 	return lis, server.Stop
diff --git a/internal/runnerv2service/service_resolve_program_test.go b/internal/runnerv2service/service_resolve_program_test.go
index 1ce0a5c36..cafa78e2b 100644
--- a/internal/runnerv2service/service_resolve_program_test.go
+++ b/internal/runnerv2service/service_resolve_program_test.go
@@ -14,10 +14,13 @@ import (
 )
 
 // todo(sebastian): port test cases from v1
-func TestRunnerServiceResolveProgram(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+func TestRunnerService_ResolveProgram(t *testing.T) {
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	testCases := []struct {
 		name    string
@@ -61,6 +64,8 @@ func TestRunnerServiceResolveProgram(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
 			resp, err := client.ResolveProgram(context.Background(), tc.request)
 			require.NoError(t, err)
 			require.Len(t, resp.Vars, 2)
@@ -88,13 +93,13 @@ func TestRunnerServiceResolveProgram(t *testing.T) {
 	}
 }
 
-func TestRunnerResolveProgram_CommandsWithNewLines(t *testing.T) {
+func TestRunnerService_ResolveProgram_CommandsWithNewLines(t *testing.T) {
 	// TODO(adamb): enable it when we find a solution for merging commands and splitting them back.
 	t.Skip("the problem is unknown and needs to be fixed")
 
-	lis, stop := testStartRunnerServiceServer(t)
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	request := &runnerv2.ResolveProgramRequest{
 		Env:        []string{"FILE_NAME=my-file.txt"},
@@ -143,12 +148,16 @@ func TestRunnerResolveProgram_CommandsWithNewLines(t *testing.T) {
 	)
 }
 
-func TestRunnerResolveProgram_OnlyShellLanguages(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+func TestRunnerService_ResolveProgram_OnlyShellLanguages(t *testing.T) {
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	t.Run("Javascript passed as script", func(t *testing.T) {
+		t.Parallel()
 		script := "console.log('test');"
 		request := &runnerv2.ResolveProgramRequest{
 			Env:        []string{"TEST_RESOLVED=value"},
@@ -165,6 +174,7 @@ func TestRunnerResolveProgram_OnlyShellLanguages(t *testing.T) {
 	})
 
 	t.Run("Python passed as commands", func(t *testing.T) {
+		t.Parallel()
 		script := "print('test')"
 		request := &runnerv2.ResolveProgramRequest{
 			LanguageId: "py",
diff --git a/internal/runnerv2service/service_sessions_test.go b/internal/runnerv2service/service_sessions_test.go
index 43d6727ae..f0e7e2238 100644
--- a/internal/runnerv2service/service_sessions_test.go
+++ b/internal/runnerv2service/service_sessions_test.go
@@ -8,30 +8,28 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/resolver"
 
 	"github.com/stateful/runme/v3/internal/testutils"
 	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
 	"github.com/stateful/runme/v3/pkg/project/teststub"
 )
 
-func init() {
-	resolver.SetDefaultScheme("passthrough")
-}
+func TestRunnerService_Sessions(t *testing.T) {
+	t.Parallel()
 
-// TODO(adamb): add a test case with project.
-func TestRunnerServiceSessions(t *testing.T) {
 	temp := t.TempDir()
 	testData := teststub.Setup(t, temp)
 
-	lis, stop := testStartRunnerServiceServer(t)
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
 
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
-	EnvStoreSeedingNone := runnerv2.CreateSessionRequest_Config_SESSION_ENV_STORE_SEEDING_UNSPECIFIED.Enum()
+	envStoreSeedingNone := runnerv2.CreateSessionRequest_Config_SESSION_ENV_STORE_SEEDING_UNSPECIFIED.Enum()
 
 	t.Run("WithEnv", func(t *testing.T) {
+		t.Parallel()
+
 		createResp, err := client.CreateSession(context.Background(), &runnerv2.CreateSessionRequest{})
 		require.NoError(t, err)
 		require.NotNil(t, createResp.Session)
@@ -39,7 +37,7 @@ func TestRunnerServiceSessions(t *testing.T) {
 		createResp, err = client.CreateSession(context.Background(),
 			&runnerv2.CreateSessionRequest{
 				Env:    []string{"TEST1=value1"},
-				Config: &runnerv2.CreateSessionRequest_Config{EnvStoreSeeding: EnvStoreSeedingNone},
+				Config: &runnerv2.CreateSessionRequest_Config{EnvStoreSeeding: envStoreSeedingNone},
 			},
 		)
 		require.NoError(t, err)
@@ -66,11 +64,12 @@ func TestRunnerServiceSessions(t *testing.T) {
 	})
 
 	t.Run("WithProject", func(t *testing.T) {
+		t.Parallel()
 		projectPath := testData.GitProjectPath()
 		createResp, err := client.CreateSession(
 			context.Background(),
 			&runnerv2.CreateSessionRequest{
-				Config:  &runnerv2.CreateSessionRequest_Config{EnvStoreSeeding: EnvStoreSeedingNone},
+				Config:  &runnerv2.CreateSessionRequest_Config{EnvStoreSeeding: envStoreSeedingNone},
 				Project: &runnerv2.Project{Root: projectPath, EnvLoadOrder: []string{".env"}},
 			},
 		)
@@ -80,6 +79,7 @@ func TestRunnerServiceSessions(t *testing.T) {
 	})
 
 	t.Run("WithEnvStoreSeedingSystem", func(t *testing.T) {
+		t.Parallel()
 		EnvStoreSeedingSystem := runnerv2.CreateSessionRequest_Config_SESSION_ENV_STORE_SEEDING_SYSTEM.Enum()
 		createResp, err := client.CreateSession(
 			context.Background(),
@@ -95,6 +95,7 @@ func TestRunnerServiceSessions(t *testing.T) {
 	})
 
 	t.Run("WithEnvStoreSeedingLegacy", func(t *testing.T) {
+		t.Parallel()
 		createResp, err := client.CreateSession(
 			context.Background(),
 			&runnerv2.CreateSessionRequest{
@@ -108,6 +109,7 @@ func TestRunnerServiceSessions(t *testing.T) {
 	})
 
 	t.Run("WithProjectInvalid", func(t *testing.T) {
+		t.Parallel()
 		_, err := client.CreateSession(
 			context.Background(),
 			&runnerv2.CreateSessionRequest{Project: &runnerv2.Project{Root: "/non/existing/path"}},
@@ -116,11 +118,13 @@ func TestRunnerServiceSessions(t *testing.T) {
 	})
 }
 
-func TestRunnerServiceSessions_StrategyMostRecent(t *testing.T) {
-	lis, stop := testStartRunnerServiceServer(t)
+func TestRunnerService_Sessions_ExecuteWithStrategyMostRecent(t *testing.T) {
+	t.Parallel()
+
+	lis, stop := startRunnerServiceServer(t)
 	t.Cleanup(stop)
 
-	_, client := testutils.NewTestGRPCClient(t, lis, runnerv2.NewRunnerServiceClient)
+	_, client := testutils.NewGRPCClientWithT(t, lis, runnerv2.NewRunnerServiceClient)
 
 	// Create a session with env.
 	sessResp, err := client.CreateSession(
diff --git a/internal/runnerv2service/service_test.go b/internal/runnerv2service/service_test.go
new file mode 100644
index 000000000..804a770d3
--- /dev/null
+++ b/internal/runnerv2service/service_test.go
@@ -0,0 +1,29 @@
+package runnerv2service
+
+import (
+	"testing/fstest"
+
+	"github.com/stateful/runme/v3/internal/command"
+	"github.com/stateful/runme/v3/internal/config"
+	"github.com/stateful/runme/v3/internal/config/autoconfig"
+)
+
+func init() {
+	command.SetEnvDumpCommand("env -0")
+
+	// Server uses autoconfig to get necessary dependencies.
+	// One of them, implicit, is [config.Config]. With the default
+	// [config.Loader] it won't be found during testing, so
+	// we need to provide an override.
+	if err := autoconfig.DecorateRoot(func(loader *config.Loader) *config.Loader {
+		fsys := fstest.MapFS{
+			"runme.yaml": {
+				Data: []byte("version: v1alpha1\n"),
+			},
+		}
+		loader.SetConfigRootPath(fsys)
+		return loader
+	}); err != nil {
+		panic(err)
+	}
+}
diff --git a/internal/testutils/grpc.go b/internal/testutils/grpc.go
index 266cdb359..d28e92bcd 100644
--- a/internal/testutils/grpc.go
+++ b/internal/testutils/grpc.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
-func NewTestGRPCClient[T any](
+func NewGRPCClientWithT[T any](
 	t *testing.T,
 	lis interface{ Dial() (net.Conn, error) },
 	fn func(grpc.ClientConnInterface) T,
diff --git a/internal/testutils/runnerservice/runner_service.go b/internal/testutils/runnerservice/runner_service.go
new file mode 100644
index 000000000..651f06c60
--- /dev/null
+++ b/internal/testutils/runnerservice/runner_service.go
@@ -0,0 +1,32 @@
+package runnerservice
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap/zaptest"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/test/bufconn"
+
+	"github.com/stateful/runme/v3/internal/command"
+	"github.com/stateful/runme/v3/internal/runnerv2service"
+	runnerv2 "github.com/stateful/runme/v3/pkg/api/gen/proto/go/runme/runner/v2"
+)
+
+func New(t *testing.T) (_ *bufconn.Listener, stop func()) {
+	t.Helper()
+
+	logger := zaptest.NewLogger(t)
+	factory := command.NewFactory(command.WithLogger(logger))
+
+	runnerService, err := runnerv2service.NewRunnerService(factory, logger)
+	require.NoError(t, err)
+
+	server := grpc.NewServer()
+	runnerv2.RegisterRunnerServiceServer(server, runnerService)
+
+	lis := bufconn.Listen(1 << 20) // 1 MB
+	go server.Serve(lis)
+
+	return lis, server.Stop
+}