diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml
index b4f56b3b6007..b35a0fd8eebd 100644
--- a/.github/workflows/buildkit.yml
+++ b/.github/workflows/buildkit.yml
@@ -143,6 +143,9 @@ jobs:
           tags: nydus
           skip-integration-tests: 1
           typ: integration
+        - pkg: ./cache/remotecache/gha
+          worker: oci
+          typ: integration
 
   govulncheck:
     runs-on: ubuntu-24.04
diff --git a/cache/remotecache/gha/gha_test.go b/cache/remotecache/gha/gha_test.go
new file mode 100644
index 000000000000..fd92a14eebe8
--- /dev/null
+++ b/cache/remotecache/gha/gha_test.go
@@ -0,0 +1,152 @@
+package gha
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/moby/buildkit/client"
+	"github.com/moby/buildkit/client/llb"
+	"github.com/moby/buildkit/util/testutil/integration"
+	"github.com/moby/buildkit/util/testutil/workers"
+	"github.com/stretchr/testify/require"
+)
+
+func init() {
+	if workers.IsTestDockerd() {
+		workers.InitDockerdWorker()
+	} else {
+		workers.InitOCIWorker()
+		workers.InitContainerdWorker()
+	}
+}
+
+func TestGhaCacheIntegration(t *testing.T) {
+	integration.Run(t,
+		integration.TestFuncs(testBasicGhaCacheImportExportExtraTimeout),
+		integration.WithMirroredImages(integration.OfficialImages("busybox:latest")),
+	)
+}
+
+func testBasicGhaCacheImportExportExtraTimeout(t *testing.T, sb integration.Sandbox) {
+	requiresLinux(t)
+	workers.CheckFeatureCompat(t, sb,
+		workers.FeatureCacheExport,
+		workers.FeatureCacheImport,
+		workers.FeatureCacheBackendGha,
+	)
+
+	c, err := client.New(sb.Context(), sb.Address())
+	require.NoError(t, err)
+	defer c.Close()
+
+	busybox := llb.Image("busybox:latest")
+	st := llb.Scratch()
+
+	run := func(cmd string) {
+		st = busybox.Run(llb.Shlex(cmd), llb.Dir("/wd")).AddMount("/wd", st)
+	}
+
+	run(`sh -c "echo -n foobar > const"`)
+	run(`sh -c "cat /dev/urandom | head -c 100 | sha256sum > unique"`)
+
+	def, err := st.Marshal(sb.Context())
+	require.NoError(t, err)
+
+	destDir := t.TempDir()
+
+	runtimeToken := os.Getenv("ACTIONS_RUNTIME_TOKEN")
+	cacheURL := os.Getenv("ACTIONS_CACHE_URL")
+	if runtimeToken == "" || cacheURL == "" {
+		t.Skip("ACTIONS_RUNTIME_TOKEN and ACTIONS_CACHE_URL must be set")
+	}
+
+	scope := "buildkit-" + t.Name()
+	if ref := os.Getenv("GITHUB_REF"); ref != "" {
+		if strings.HasPrefix(ref, "refs/heads/") {
+			scope += "-" + strings.TrimPrefix(ref, "refs/heads/")
+		} else if strings.HasPrefix(ref, "refs/tags/") {
+			scope += "-" + strings.TrimPrefix(ref, "refs/tags/")
+		} else if strings.HasPrefix(ref, "refs/pull/") {
+			scope += "-pr" + strings.TrimPrefix(strings.TrimSuffix(strings.TrimSuffix(ref, "/head"), "/merge"), "refs/pull/")
+		}
+	}
+
+	_, err = c.Solve(sb.Context(), def, client.SolveOpt{
+		Exports: []client.ExportEntry{
+			{
+				Type:      client.ExporterLocal,
+				OutputDir: destDir,
+			},
+		},
+		CacheExports: []client.CacheOptionsEntry{{
+			Type: "gha",
+			Attrs: map[string]string{
+				"url":   cacheURL,
+				"token": runtimeToken,
+				"scope": scope,
+				"mode":  "max",
+			},
+		}},
+	}, nil)
+	require.NoError(t, err)
+
+	dt, err := os.ReadFile(filepath.Join(destDir, "const"))
+	require.NoError(t, err)
+	require.Equal(t, "foobar", string(dt))
+
+	dt, err = os.ReadFile(filepath.Join(destDir, "unique"))
+	require.NoError(t, err)
+
+	ensurePruneAll(t, c, sb)
+
+	destDir = t.TempDir()
+
+	_, err = c.Solve(sb.Context(), def, client.SolveOpt{
+		Exports: []client.ExportEntry{
+			{
+				Type:      client.ExporterLocal,
+				OutputDir: destDir,
+			},
+		},
+		CacheImports: []client.CacheOptionsEntry{{
+			Type: "gha",
+			Attrs: map[string]string{
+				"url":   cacheURL,
+				"token": runtimeToken,
+				"scope": scope,
+			},
+		}},
+	}, nil)
+	require.NoError(t, err)
+
+	dt2, err := os.ReadFile(filepath.Join(destDir, "const"))
+	require.NoError(t, err)
+	require.Equal(t, "foobar", string(dt2))
+
+	dt2, err = os.ReadFile(filepath.Join(destDir, "unique"))
+	require.NoError(t, err)
+	require.Equal(t, string(dt), string(dt2))
+}
+
+func ensurePruneAll(t *testing.T, c *client.Client, sb integration.Sandbox) {
+	for i := 0; i < 2; i++ {
+		require.NoError(t, c.Prune(sb.Context(), nil, client.PruneAll))
+		for j := 0; j < 20; j++ {
+			du, err := c.DiskUsage(sb.Context())
+			require.NoError(t, err)
+			if len(du) == 0 {
+				return
+			}
+			time.Sleep(500 * time.Millisecond)
+		}
+		t.Logf("retrying prune(%d)", i)
+	}
+	t.Fatalf("failed to ensure prune")
+}
+
+func requiresLinux(t *testing.T) {
+	integration.SkipOnPlatform(t, "!linux")
+}
diff --git a/client/client_test.go b/client/client_test.go
index ace0060aa142..381bf48f315d 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -148,7 +148,6 @@ var allTests = []func(t *testing.T, sb integration.Sandbox){
 	testHostnameSpecifying,
 	testPushByDigest,
 	testBasicInlineCacheImportExport,
-	testBasicGhaCacheImportExportExtraTimeout,
 	testExportBusyboxLocal,
 	testBridgeNetworking,
 	testCacheMountNoCache,
@@ -6176,49 +6175,6 @@ func testBasicInlineCacheImportExport(t *testing.T, sb integration.Sandbox) {
 	require.EqualValues(t, unique, unique3)
 }
 
-func testBasicGhaCacheImportExportExtraTimeout(t *testing.T, sb integration.Sandbox) {
-	workers.CheckFeatureCompat(t, sb,
-		workers.FeatureCacheExport,
-		workers.FeatureCacheImport,
-		workers.FeatureCacheBackendGha,
-	)
-	runtimeToken := os.Getenv("ACTIONS_RUNTIME_TOKEN")
-	cacheURL := os.Getenv("ACTIONS_CACHE_URL")
-	if runtimeToken == "" || cacheURL == "" {
-		t.Skip("ACTIONS_RUNTIME_TOKEN and ACTIONS_CACHE_URL must be set")
-	}
-
-	scope := "buildkit-" + t.Name()
-	if ref := os.Getenv("GITHUB_REF"); ref != "" {
-		if strings.HasPrefix(ref, "refs/heads/") {
-			scope += "-" + strings.TrimPrefix(ref, "refs/heads/")
-		} else if strings.HasPrefix(ref, "refs/tags/") {
-			scope += "-" + strings.TrimPrefix(ref, "refs/tags/")
-		} else if strings.HasPrefix(ref, "refs/pull/") {
-			scope += "-pr" + strings.TrimPrefix(strings.TrimSuffix(strings.TrimSuffix(ref, "/head"), "/merge"), "refs/pull/")
-		}
-	}
-
-	im := CacheOptionsEntry{
-		Type: "gha",
-		Attrs: map[string]string{
-			"url":   cacheURL,
-			"token": runtimeToken,
-			"scope": scope,
-		},
-	}
-	ex := CacheOptionsEntry{
-		Type: "gha",
-		Attrs: map[string]string{
-			"url":   cacheURL,
-			"token": runtimeToken,
-			"scope": scope,
-			"mode":  "max",
-		},
-	}
-	testBasicCacheImportExport(t, sb, []CacheOptionsEntry{im}, []CacheOptionsEntry{ex})
-}
-
 func testRegistryEmptyCacheExport(t *testing.T, sb integration.Sandbox) {
 	workers.CheckFeatureCompat(t, sb,
 		workers.FeatureCacheExport,