diff --git a/etcdserver/api/v2v3/main_test.go b/etcdserver/api/v2v3/main_test.go
new file mode 100644
index 00000000000..0e85086858a
--- /dev/null
+++ b/etcdserver/api/v2v3/main_test.go
@@ -0,0 +1,44 @@
+// Copyright 2019 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 v2v3_test
+
+import (
+	"fmt"
+	"os"
+	"testing"
+	"time"
+
+	"go.etcd.io/etcd/integration"
+	"go.etcd.io/etcd/pkg/testutil"
+)
+
+var endpoints []string
+
+// TestMain sets up an etcd cluster for running the examples.
+func TestMain(m *testing.M) {
+	cfg := integration.ClusterConfig{Size: 1}
+	clus := integration.NewClusterV3(nil, &cfg)
+	endpoints = []string{clus.Client(0).Endpoints()[0]}
+	v := m.Run()
+	clus.Terminate(nil)
+	if err := testutil.CheckAfterTest(time.Second); err != nil {
+		fmt.Fprintf(os.Stderr, "%v", err)
+		os.Exit(1)
+	}
+	if v == 0 && testutil.CheckLeakedGoroutine() {
+		os.Exit(1)
+	}
+	os.Exit(v)
+}
diff --git a/etcdserver/api/v2v3/store_test.go b/etcdserver/api/v2v3/store_test.go
new file mode 100644
index 00000000000..217a058a7fa
--- /dev/null
+++ b/etcdserver/api/v2v3/store_test.go
@@ -0,0 +1,143 @@
+// Copyright 2019 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 v2v3_test
+
+import (
+	"log"
+	"strings"
+	"testing"
+
+	"go.etcd.io/etcd/clientv3"
+	"go.etcd.io/etcd/etcdserver/api/v2store"
+	"go.etcd.io/etcd/etcdserver/api/v2v3"
+)
+
+func TestCreateKV(t *testing.T) {
+	testCases := []struct {
+		key          string
+		value        string
+		nodes        int
+		unique       bool
+		wantErr      bool
+		wantKeyMatch bool
+	}{
+		{key: "/cdir/create", value: "1", nodes: 1, wantKeyMatch: true},
+		{key: "/cdir/create", value: "4", wantErr: true},
+		// TODO: unique doesn't create nodes, skip these tests for now
+		//{key: "hello", value: "2", unique: true, wantKeyMatch: false},
+		//{key: "hello", value: "3", unique: true, wantKeyMatch: false},
+	}
+
+	cli, err := clientv3.New(clientv3.Config{Endpoints: endpoints})
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer cli.Close()
+	v2 := v2v3.NewStore(cli, "")
+
+	for ti, tc := range testCases {
+		ev, err := v2.Create(tc.key, false, tc.value, tc.unique, v2store.TTLOptionSet{})
+		if tc.wantErr && err != nil {
+			continue
+		}
+		if err != nil {
+			t.Fatalf("%d: got err %v", ti, err)
+		}
+
+		if tc.wantKeyMatch && tc.key != ev.Node.Key {
+			t.Fatalf("%d: %v != %v", ti, tc.key, ev.Node.Key)
+		}
+		if !tc.wantKeyMatch && !strings.HasPrefix(ev.Node.Key, tc.key) {
+			t.Fatalf("%d: %v is not prefix of %v", ti, tc.key, ev.Node.Key)
+		}
+
+		evg, err := v2.Get(tc.key, false, false)
+		if evg.Node.CreatedIndex != ev.Node.CreatedIndex {
+			t.Fatalf("%d: %v != %v", ti, evg.Node.CreatedIndex, ev.Node.CreatedIndex)
+		}
+
+		t.Logf("%d: %v %s %v\n", ti, ev.Node.Key, *ev.Node.Value, ev.Node.CreatedIndex)
+	}
+}
+
+func TestSetKV(t *testing.T) {
+	testCases := []struct {
+		key            string
+		value          string
+		dir            bool
+		wantIndexMatch bool
+	}{
+		{key: "/sdir/set", value: "1", wantIndexMatch: true},
+		{key: "/sdir/set", value: "4", wantIndexMatch: false},
+	}
+
+	cli, err := clientv3.New(clientv3.Config{Endpoints: endpoints})
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer cli.Close()
+	v2 := v2v3.NewStore(cli, "")
+
+	for ti, tc := range testCases {
+		ev, err := v2.Set(tc.key, false, tc.value, v2store.TTLOptionSet{})
+		if err != nil {
+			t.Fatalf("%d: got err %v", ti, err)
+		}
+
+		if tc.value != *ev.Node.Value {
+			t.Fatalf("%d: %v != %v", ti, tc.value, *ev.Node.Value)
+		}
+
+		if tc.wantIndexMatch && ev.Node.CreatedIndex != ev.Node.ModifiedIndex {
+			t.Fatalf("%d: index %v != %v", ti, ev.Node.CreatedIndex, ev.Node.ModifiedIndex)
+		}
+
+		t.Logf("%d: %v %s %v\n", ti, ev.Node.Key, *ev.Node.Value, ev.Node.CreatedIndex)
+	}
+}
+
+func TestCreateSetDir(t *testing.T) {
+	testCases := []struct {
+		dir string
+	}{
+		{dir: "/ddir/1/2/3"},
+		{dir: "/ddir/1/2/3"},
+	}
+
+	cli, err := clientv3.New(clientv3.Config{Endpoints: endpoints})
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer cli.Close()
+	v2 := v2v3.NewStore(cli, "")
+
+	for ti, tc := range testCases {
+		ev, err := v2.Create(tc.dir, true, "", false, v2store.TTLOptionSet{})
+		if err != nil {
+			t.Fatalf("%d: got err %v", ti, err)
+		}
+		_, err = v2.Create(tc.dir, true, "", false, v2store.TTLOptionSet{})
+		if err == nil {
+			t.Fatalf("%d: expected err got nil", ti)
+		}
+
+		ev, err = v2.Delete("ddir", true, true)
+		if err != nil {
+			t.Fatalf("%d: got err %v", ti, err)
+		}
+
+		t.Logf("%d: %v %s %v\n", ti, ev.EtcdIndex, ev.PrevNode.Key, ev.PrevNode.CreatedIndex)
+	}
+}