diff --git a/e2e/ctl_v3_migrate_test.go b/e2e/ctl_v3_migrate_test.go
new file mode 100644
index 000000000..3c6ac15f5
--- /dev/null
+++ b/e2e/ctl_v3_migrate_test.go
@@ -0,0 +1,108 @@
+// Copyright 2016 The etcd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package e2e
+
+import (
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"golang.org/x/net/context"
+
+	"github.com/coreos/etcd/clientv3"
+	"github.com/coreos/etcd/pkg/testutil"
+)
+
+func TestCtlV3Migrate(t *testing.T) {
+	defer testutil.AfterTest(t)
+
+	epc := setupEtcdctlTest(t, &configNoTLS, true)
+	defer func() {
+		if errC := epc.Close(); errC != nil {
+			t.Fatalf("error closing etcd processes (%v)", errC)
+		}
+	}()
+
+	keys := make([]string, 3)
+	vals := make([]string, 3)
+	for i := range keys {
+		keys[i] = fmt.Sprintf("foo_%d", i)
+		vals[i] = fmt.Sprintf("bar_%d", i)
+	}
+	for i := range keys {
+		if err := etcdctlSet(epc, keys[i], vals[i]); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	dataDirs := make([]string, len(epc.procs))
+	for i := range epc.procs {
+		dataDirs[i] = epc.procs[i].cfg.dataDirPath
+	}
+	if err := epc.Stop(); err != nil {
+		t.Fatalf("error closing etcd processes (%v)", err)
+	}
+
+	os.Setenv("ETCDCTL_API", "3")
+	defer os.Unsetenv("ETCDCTL_API")
+	cx := ctlCtx{
+		t:           t,
+		cfg:         configNoTLS,
+		dialTimeout: 7 * time.Second,
+		quorum:      true,
+		epc:         epc,
+	}
+	for i := range dataDirs {
+		if err := ctlV3Migrate(cx, dataDirs[i], ""); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	for i := range epc.procs {
+		epc.procs[i].cfg.keepDataDir = true
+	}
+	if err := epc.Restart(); err != nil {
+		t.Fatal(err)
+	}
+
+	// to ensure revision increment is continuous from migrated v2 data
+	if err := ctlV3Put(cx, "test", "value", ""); err != nil {
+		t.Fatal(err)
+	}
+	cli, err := clientv3.New(clientv3.Config{
+		Endpoints:   epc.grpcEndpoints(),
+		DialTimeout: 3 * time.Second,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer cli.Close()
+	resp, err := cli.Get(context.TODO(), "test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(resp.Kvs) != 1 {
+		t.Fatalf("len(resp.Kvs) expected 1, got %+v", resp.Kvs)
+	}
+	if resp.Kvs[0].CreateRevision != 4 {
+		t.Fatalf("resp.Kvs[0].CreateRevision expected 4, got %d", resp.Kvs[0].CreateRevision)
+	}
+}
+
+func ctlV3Migrate(cx ctlCtx, dataDir, walDir string) error {
+	cmdArgs := append(cx.PrefixArgs(), "migrate", "--data-dir", dataDir, "--wal-dir", walDir)
+	return spawnWithExpects(cmdArgs, "finished transforming keys")
+}