@@ -6213,9 +6213,8 @@ func (s *DockerCLIBuildSuite) TestBuildEmitsEvents(t *testing.T) {

 			},

 		} {

 			t.Run(fmt.Sprintf("buildkit=%v/%s", builder.buildkit, tc.name), func(t *testing.T) {

-				if builder.buildkit {

-					skip.If(t, DaemonIsWindows, "Buildkit is not supported on Windows")

-				}

+				skip.If(t, builder.buildkit && DaemonIsWindows() && !containerdSnapshotterEnabled(),

+					"Buildkit is not supported on Windows with graphdrivers")

 				time.Sleep(time.Second)

 				before := time.Now()

@@ -720,9 +720,8 @@ func TestBuildEmitsImageCreateEvent(t *testing.T) {

 	for _, builderVersion := range []build.BuilderVersion{build.BuilderV1, build.BuilderBuildKit} {

 		t.Run("v"+string(builderVersion), func(t *testing.T) {

-			if builderVersion == build.BuilderBuildKit {

-				skip.If(t, testEnv.DaemonInfo.OSType == "windows", "Buildkit is not supported on Windows")

-			}

+			skip.If(t, builderVersion == build.BuilderBuildKit && testEnv.DaemonInfo.OSType == "windows" && !testEnv.UsingSnapshotter(),

+				"Buildkit is not supported on Windows with graphdrivers")

 			ctx, cancel := context.WithCancel(ctx)

 			defer cancel()

@@ -774,7 +773,6 @@ func TestBuildEmitsImageCreateEvent(t *testing.T) {

 }

 func TestBuildHistoryDoesNotPreventRemoval(t *testing.T) {

-	skip.If(t, testEnv.DaemonInfo.OSType == "windows", "buildkit is not supported on Windows")

 	skip.If(t, !testEnv.UsingSnapshotter(), "only relevant to c8d integration")

 	ctx := setupTest(t)

@@ -6,6 +6,10 @@ import (

 	"testing"

 	"time"

+	// Register the npipe: protocol connection helper so the Buildkit client

+	// can dial Windows daemons.

+	_ "github.com/moby/buildkit/client/connhelper/npipe"

+

 	moby_buildkit_v1 "github.com/moby/buildkit/api/services/control"

 	"github.com/moby/buildkit/client"

 	"github.com/moby/buildkit/client/llb"

@@ -28,7 +32,8 @@ func (t *testWriter) Write(p []byte) (int, error) {

 }

 func TestBuildkitHistoryTracePropagation(t *testing.T) {

-	skip.If(t, testEnv.DaemonInfo.OSType == "windows", "buildkit is not supported on Windows")

+	skip.If(t, testEnv.DaemonInfo.OSType == "windows" && !testEnv.UsingSnapshotter(),

+		"buildkit is not supported on Windows with graphdrivers")

 	ctx := testutil.StartSpan(baseContext, t)

new file mode 100644

@@ -0,0 +1,8 @@

+// Package npipe provides connhelper for npipe://<address>

+package npipe

+

+import "github.com/moby/buildkit/client/connhelper"

+

+func init() {

+	connhelper.Register("npipe", Helper)

+}

new file mode 100644

@@ -0,0 +1,14 @@

+//go:build !windows

+

+package npipe

+

+import (

+	"errors"

+	"net/url"

+

+	"github.com/moby/buildkit/client/connhelper"

+)

+

+func Helper(u *url.URL) (*connhelper.ConnectionHelper, error) {

+	return nil, errors.New("npipe connections are only supported on windows")

+}

new file mode 100644

@@ -0,0 +1,28 @@

+//go:build windows

+

+package npipe

+

+import (

+	"context"

+	"net"

+	"net/url"

+	"strings"

+

+	"github.com/Microsoft/go-winio"

+	"github.com/moby/buildkit/client/connhelper"

+	"github.com/pkg/errors"

+)

+

+// Helper returns helper for connecting to a url via npipes.

+func Helper(u *url.URL) (*connhelper.ConnectionHelper, error) {

+	addrParts := strings.SplitN(u.String(), "://", 2)

+	if len(addrParts) != 2 {

+		return nil, errors.Errorf("invalid address %s", u)

+	}

+	address := strings.ReplaceAll(addrParts[1], "/", "\\")

+	return &connhelper.ConnectionHelper{

+		ContextDialer: func(ctx context.Context, addr string) (net.Conn, error) {

+			return winio.DialPipeContext(ctx, address)

+		},

+	}, nil

+}

@@ -992,6 +992,7 @@ github.com/moby/buildkit/cache/util

 github.com/moby/buildkit/client

 github.com/moby/buildkit/client/buildid

 github.com/moby/buildkit/client/connhelper

+github.com/moby/buildkit/client/connhelper/npipe

 github.com/moby/buildkit/client/llb

 github.com/moby/buildkit/client/llb/imagemetaresolver

 github.com/moby/buildkit/client/llb/sourceresolver