diff --git a/e2e/cluster_direct_test.go b/tests/e2e/cluster_direct_test.go
similarity index 100%
rename from e2e/cluster_direct_test.go
rename to tests/e2e/cluster_direct_test.go
diff --git a/e2e/cluster_proxy_test.go b/tests/e2e/cluster_proxy_test.go
similarity index 100%
rename from e2e/cluster_proxy_test.go
rename to tests/e2e/cluster_proxy_test.go
diff --git a/e2e/cluster_test.go b/tests/e2e/cluster_test.go
similarity index 100%
rename from e2e/cluster_test.go
rename to tests/e2e/cluster_test.go
diff --git a/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go
similarity index 100%
rename from e2e/ctl_v2_test.go
rename to tests/e2e/ctl_v2_test.go
diff --git a/e2e/ctl_v3_alarm_test.go b/tests/e2e/ctl_v3_alarm_test.go
similarity index 100%
rename from e2e/ctl_v3_alarm_test.go
rename to tests/e2e/ctl_v3_alarm_test.go
diff --git a/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go
similarity index 100%
rename from e2e/ctl_v3_auth_test.go
rename to tests/e2e/ctl_v3_auth_test.go
diff --git a/e2e/ctl_v3_compact_test.go b/tests/e2e/ctl_v3_compact_test.go
similarity index 100%
rename from e2e/ctl_v3_compact_test.go
rename to tests/e2e/ctl_v3_compact_test.go
diff --git a/e2e/ctl_v3_defrag_test.go b/tests/e2e/ctl_v3_defrag_test.go
similarity index 100%
rename from e2e/ctl_v3_defrag_test.go
rename to tests/e2e/ctl_v3_defrag_test.go
diff --git a/e2e/ctl_v3_elect_test.go b/tests/e2e/ctl_v3_elect_test.go
similarity index 100%
rename from e2e/ctl_v3_elect_test.go
rename to tests/e2e/ctl_v3_elect_test.go
diff --git a/e2e/ctl_v3_endpoint_test.go b/tests/e2e/ctl_v3_endpoint_test.go
similarity index 100%
rename from e2e/ctl_v3_endpoint_test.go
rename to tests/e2e/ctl_v3_endpoint_test.go
diff --git a/e2e/ctl_v3_kv_test.go b/tests/e2e/ctl_v3_kv_test.go
similarity index 100%
rename from e2e/ctl_v3_kv_test.go
rename to tests/e2e/ctl_v3_kv_test.go
diff --git a/e2e/ctl_v3_lease_test.go b/tests/e2e/ctl_v3_lease_test.go
similarity index 100%
rename from e2e/ctl_v3_lease_test.go
rename to tests/e2e/ctl_v3_lease_test.go
diff --git a/e2e/ctl_v3_lock_test.go b/tests/e2e/ctl_v3_lock_test.go
similarity index 100%
rename from e2e/ctl_v3_lock_test.go
rename to tests/e2e/ctl_v3_lock_test.go
diff --git a/e2e/ctl_v3_make_mirror_test.go b/tests/e2e/ctl_v3_make_mirror_test.go
similarity index 100%
rename from e2e/ctl_v3_make_mirror_test.go
rename to tests/e2e/ctl_v3_make_mirror_test.go
diff --git a/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go
similarity index 100%
rename from e2e/ctl_v3_member_test.go
rename to tests/e2e/ctl_v3_member_test.go
diff --git a/e2e/ctl_v3_migrate_test.go b/tests/e2e/ctl_v3_migrate_test.go
similarity index 100%
rename from e2e/ctl_v3_migrate_test.go
rename to tests/e2e/ctl_v3_migrate_test.go
diff --git a/e2e/ctl_v3_move_leader_test.go b/tests/e2e/ctl_v3_move_leader_test.go
similarity index 100%
rename from e2e/ctl_v3_move_leader_test.go
rename to tests/e2e/ctl_v3_move_leader_test.go
diff --git a/e2e/ctl_v3_role_test.go b/tests/e2e/ctl_v3_role_test.go
similarity index 100%
rename from e2e/ctl_v3_role_test.go
rename to tests/e2e/ctl_v3_role_test.go
diff --git a/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go
similarity index 100%
rename from e2e/ctl_v3_snapshot_test.go
rename to tests/e2e/ctl_v3_snapshot_test.go
diff --git a/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go
similarity index 100%
rename from e2e/ctl_v3_test.go
rename to tests/e2e/ctl_v3_test.go
diff --git a/e2e/ctl_v3_txn_test.go b/tests/e2e/ctl_v3_txn_test.go
similarity index 100%
rename from e2e/ctl_v3_txn_test.go
rename to tests/e2e/ctl_v3_txn_test.go
diff --git a/e2e/ctl_v3_user_test.go b/tests/e2e/ctl_v3_user_test.go
similarity index 100%
rename from e2e/ctl_v3_user_test.go
rename to tests/e2e/ctl_v3_user_test.go
diff --git a/e2e/ctl_v3_watch_test.go b/tests/e2e/ctl_v3_watch_test.go
similarity index 100%
rename from e2e/ctl_v3_watch_test.go
rename to tests/e2e/ctl_v3_watch_test.go
diff --git a/e2e/doc.go b/tests/e2e/doc.go
similarity index 100%
rename from e2e/doc.go
rename to tests/e2e/doc.go
diff --git a/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go
similarity index 100%
rename from e2e/etcd_config_test.go
rename to tests/e2e/etcd_config_test.go
diff --git a/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go
similarity index 100%
rename from e2e/etcd_corrupt_test.go
rename to tests/e2e/etcd_corrupt_test.go
diff --git a/e2e/etcd_process.go b/tests/e2e/etcd_process.go
similarity index 100%
rename from e2e/etcd_process.go
rename to tests/e2e/etcd_process.go
diff --git a/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go
similarity index 100%
rename from e2e/etcd_release_upgrade_test.go
rename to tests/e2e/etcd_release_upgrade_test.go
diff --git a/e2e/etcd_spawn_cov.go b/tests/e2e/etcd_spawn_cov.go
similarity index 100%
rename from e2e/etcd_spawn_cov.go
rename to tests/e2e/etcd_spawn_cov.go
diff --git a/e2e/etcd_spawn_nocov.go b/tests/e2e/etcd_spawn_nocov.go
similarity index 100%
rename from e2e/etcd_spawn_nocov.go
rename to tests/e2e/etcd_spawn_nocov.go
diff --git a/e2e/gateway_test.go b/tests/e2e/gateway_test.go
similarity index 100%
rename from e2e/gateway_test.go
rename to tests/e2e/gateway_test.go
diff --git a/e2e/main_test.go b/tests/e2e/main_test.go
similarity index 100%
rename from e2e/main_test.go
rename to tests/e2e/main_test.go
diff --git a/e2e/metrics_test.go b/tests/e2e/metrics_test.go
similarity index 100%
rename from e2e/metrics_test.go
rename to tests/e2e/metrics_test.go
diff --git a/e2e/util.go b/tests/e2e/util.go
similarity index 100%
rename from e2e/util.go
rename to tests/e2e/util.go
diff --git a/e2e/v2_curl_test.go b/tests/e2e/v2_curl_test.go
similarity index 100%
rename from e2e/v2_curl_test.go
rename to tests/e2e/v2_curl_test.go
diff --git a/e2e/v2_test.go b/tests/e2e/v2_test.go
similarity index 100%
rename from e2e/v2_test.go
rename to tests/e2e/v2_test.go
diff --git a/e2e/v2v3_test.go b/tests/e2e/v2v3_test.go
similarity index 100%
rename from e2e/v2v3_test.go
rename to tests/e2e/v2v3_test.go
diff --git a/e2e/v3_curl_lease_test.go b/tests/e2e/v3_curl_lease_test.go
similarity index 100%
rename from e2e/v3_curl_lease_test.go
rename to tests/e2e/v3_curl_lease_test.go
diff --git a/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go
similarity index 100%
rename from e2e/v3_curl_test.go
rename to tests/e2e/v3_curl_test.go