diff --git a/osbase/event/etcd/BUILD.bazel b/osbase/event/etcd/BUILD.bazel
index 925eeaa..a89a6c9 100644
--- a/osbase/event/etcd/BUILD.bazel
+++ b/osbase/event/etcd/BUILD.bazel
@@ -22,7 +22,7 @@
         "@io_etcd_go_etcd_api_v3//v3rpc/rpctypes",
         "@io_etcd_go_etcd_client_pkg_v3//testutil",
         "@io_etcd_go_etcd_client_v3//:client",
-        "@io_etcd_go_etcd_tests_v3//integration",
+        "@io_etcd_go_etcd_tests_v3//framework/integration",
         "@org_golang_google_grpc//codes",
         "@org_golang_google_grpc//grpclog",
         "@org_uber_go_zap//:zap",
diff --git a/osbase/event/etcd/etcd_test.go b/osbase/event/etcd/etcd_test.go
index a5cde20..729f4ad 100644
--- a/osbase/event/etcd/etcd_test.go
+++ b/osbase/event/etcd/etcd_test.go
@@ -18,7 +18,7 @@
 	"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
 	"go.etcd.io/etcd/client/pkg/v3/testutil"
 	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.etcd.io/etcd/tests/v3/integration"
+	"go.etcd.io/etcd/tests/v3/framework/integration"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -28,7 +28,7 @@
 )
 
 var (
-	cluster   *integration.ClusterV3
+	cluster   *integration.Cluster
 	endpoints []string
 )
 
@@ -50,7 +50,7 @@
 	flag.Parse()
 	integration.BeforeTestExternal(tb)
 	grpclog.SetLoggerV2(logtree.GRPCify(lt.MustLeveledFor("grpc")))
-	cluster = integration.NewClusterV3(tb, &cfg)
+	cluster = integration.NewCluster(tb, &cfg)
 	endpoints = make([]string, 3)
 	for i := range endpoints {
 		endpoints[i] = cluster.Client(i).Endpoints()[0]
diff --git a/osbase/pki/BUILD.bazel b/osbase/pki/BUILD.bazel
index ba1cbc7..e002239 100644
--- a/osbase/pki/BUILD.bazel
+++ b/osbase/pki/BUILD.bazel
@@ -27,7 +27,7 @@
     deps = [
         "//osbase/logtree",
         "@io_etcd_go_etcd_client_pkg_v3//testutil",
-        "@io_etcd_go_etcd_tests_v3//integration",
+        "@io_etcd_go_etcd_tests_v3//framework/integration",
         "@org_uber_go_zap//:zap",
     ],
 )
diff --git a/osbase/pki/certificate_test.go b/osbase/pki/certificate_test.go
index 10dce40..7e2a2ab 100644
--- a/osbase/pki/certificate_test.go
+++ b/osbase/pki/certificate_test.go
@@ -12,7 +12,7 @@
 	"testing"
 
 	"go.etcd.io/etcd/client/pkg/v3/testutil"
-	"go.etcd.io/etcd/tests/v3/integration"
+	"go.etcd.io/etcd/tests/v3/framework/integration"
 	"go.uber.org/zap"
 
 	"source.monogon.dev/osbase/logtree"
@@ -25,7 +25,7 @@
 	logtree.PipeAllToTest(t, lt)
 	tb, cancel := testutil.NewTestingTBProthesis("pki-managed")
 	defer cancel()
-	cluster := integration.NewClusterV3(tb, &integration.ClusterConfig{
+	cluster := integration.NewCluster(tb, &integration.ClusterConfig{
 		Size: 1,
 		LoggerBuilder: func(memberName string) *zap.Logger {
 			dn := logtree.DN("etcd." + memberName)
@@ -119,7 +119,7 @@
 	logtree.PipeAllToTest(t, lt)
 	tb, cancel := testutil.NewTestingTBProthesis("pki-managed")
 	defer cancel()
-	cluster := integration.NewClusterV3(tb, &integration.ClusterConfig{
+	cluster := integration.NewCluster(tb, &integration.ClusterConfig{
 		Size: 1,
 		LoggerBuilder: func(memberName string) *zap.Logger {
 			dn := logtree.DN("etcd." + memberName)
diff --git a/osbase/pki/crl_test.go b/osbase/pki/crl_test.go
index d2becf7..1e45af6 100644
--- a/osbase/pki/crl_test.go
+++ b/osbase/pki/crl_test.go
@@ -9,7 +9,7 @@
 	"testing"
 
 	"go.etcd.io/etcd/client/pkg/v3/testutil"
-	"go.etcd.io/etcd/tests/v3/integration"
+	"go.etcd.io/etcd/tests/v3/framework/integration"
 )
 
 // TestRevoke exercises the CRL revocation and watching functionality of a CA
@@ -17,7 +17,7 @@
 func TestRevoke(t *testing.T) {
 	tb, cancel := testutil.NewTestingTBProthesis("pki-revoke")
 	defer cancel()
-	cluster := integration.NewClusterV3(tb, &integration.ClusterConfig{
+	cluster := integration.NewCluster(tb, &integration.ClusterConfig{
 		Size: 1,
 	})
 	cl := cluster.Client(0)