diff --git a/e2e/etcd_test.go b/e2e/etcd_test.go
index ede1cdcdb..02463ae0d 100644
--- a/e2e/etcd_test.go
+++ b/e2e/etcd_test.go
@@ -26,16 +26,14 @@ import (
 	"github.com/coreos/etcd/pkg/fileutil"
 )
 
-const (
-	etcdProcessBasePort = 20000
-	certPath            = "../integration/fixtures/server.crt"
-	privateKeyPath      = "../integration/fixtures/server.key.insecure"
-	caPath              = "../integration/fixtures/ca.crt"
-)
+const etcdProcessBasePort = 20000
 
 var (
-	binPath    string
-	ctlBinPath string
+	binPath        string
+	ctlBinPath     string
+	certPath       string
+	privateKeyPath string
+	caPath         string
 )
 
 type clientConnType int
@@ -207,6 +205,9 @@ func newEtcdProcess(cfg *etcdProcessConfig) (*etcdProcess, error) {
 func (cfg *etcdProcessClusterConfig) etcdProcessConfigs() []*etcdProcessConfig {
 	binPath = binDir + "/etcd"
 	ctlBinPath = binDir + "/etcdctl"
+	certPath = certDir + "/server.crt"
+	privateKeyPath = certDir + "/server.key.insecure"
+	caPath = certDir + "/ca.crt"
 
 	if cfg.basePort == 0 {
 		cfg.basePort = etcdProcessBasePort
diff --git a/e2e/main_test.go b/e2e/main_test.go
index 4df4fd1d7..252943bc1 100644
--- a/e2e/main_test.go
+++ b/e2e/main_test.go
@@ -14,11 +14,13 @@ import (
 )
 
 var binDir string
+var certDir string
 
 func TestMain(m *testing.M) {
 	os.Setenv("ETCD_UNSUPPORTED_ARCH", runtime.GOARCH)
 
 	flag.StringVar(&binDir, "bin-dir", "../bin", "The directory for store etcd and etcdctl binaries.")
+	flag.StringVar(&certDir, "cert-dir", "../integration/fixtures", "The directory for store certificate files.")
 	flag.Parse()
 
 	v := m.Run()