diff --git a/etcdmain/config.go b/etcdmain/config.go
index 0fdc03233..00fb61053 100644
--- a/etcdmain/config.go
+++ b/etcdmain/config.go
@@ -59,6 +59,9 @@ var (
 		"v",
 		"vv",
 	}
+
+	ErrConflictBootstrapFlags = fmt.Errorf("multiple discovery or bootstrap flags are set" +
+		"Choose one of \"initial-cluster\", \"discovery\" or \"discovery-srv\"")
 )
 
 type config struct {
@@ -189,7 +192,7 @@ func NewConfig() *config {
 }
 
 func (cfg *config) Parse(arguments []string) error {
-	perr := cfg.FlagSet.Parse(os.Args[1:])
+	perr := cfg.FlagSet.Parse(arguments)
 	switch perr {
 	case nil:
 	case flag.ErrHelp:
@@ -213,13 +216,13 @@ func (cfg *config) Parse(arguments []string) error {
 		set[f.Name] = true
 	})
 	nSet := 0
-	for _, v := range []bool{set["discovery"], set["inital-cluster"], set["discovery-srv"]} {
+	for _, v := range []bool{set["discovery"], set["initial-cluster"], set["discovery-srv"]} {
 		if v {
 			nSet += 1
 		}
 	}
 	if nSet > 1 {
-		return fmt.Errorf("multiple discovery or bootstrap flags are set. Choose one of \"discovery\", \"initial-cluster\", or \"discovery-srv\"")
+		return ErrConflictBootstrapFlags
 	}
 
 	cfg.lpurls, err = flags.URLsFromFlags(cfg.FlagSet, "listen-peer-urls", "peer-bind-addr", cfg.peerTLSInfo)
diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go
new file mode 100644
index 000000000..73947f53e
--- /dev/null
+++ b/etcdmain/config_test.go
@@ -0,0 +1,168 @@
+package etcdmain
+
+import (
+	"net/url"
+	"reflect"
+	"testing"
+)
+
+func TestConfigParsingMemberFlags(t *testing.T) {
+	args := []string{
+		"-data-dir=testdir",
+		"-name=testname",
+		"-max-wals=10",
+		"-max-snapshots=10",
+		"-snapshot-count=10",
+		"-listen-peer-urls=http://localhost:8000,https://localhost:8001",
+		"-listen-client-urls=http://localhost:7000,https://localhost:7001",
+	}
+	wcfg := &config{
+		dir:          "testdir",
+		lpurls:       []url.URL{{Scheme: "http", Host: "localhost:8000"}, {Scheme: "https", Host: "localhost:8001"}},
+		lcurls:       []url.URL{{Scheme: "http", Host: "localhost:7000"}, {Scheme: "https", Host: "localhost:7001"}},
+		maxSnapFiles: 10,
+		maxWalFiles:  10,
+		name:         "testname",
+		snapCount:    10,
+	}
+
+	cfg := NewConfig()
+	err := cfg.Parse(args)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cfg.dir != wcfg.dir {
+		t.Errorf("dir = %v, want %v", cfg.dir, wcfg.dir)
+	}
+	if cfg.maxSnapFiles != wcfg.maxSnapFiles {
+		t.Errorf("maxsnap = %v, want %v", cfg.maxSnapFiles, wcfg.maxSnapFiles)
+	}
+	if cfg.maxWalFiles != wcfg.maxWalFiles {
+		t.Errorf("maxwal = %v, want %v", cfg.maxWalFiles, wcfg.maxWalFiles)
+	}
+	if cfg.name != wcfg.name {
+		t.Errorf("name = %v, want %v", cfg.name, wcfg.name)
+	}
+	if cfg.snapCount != wcfg.snapCount {
+		t.Errorf("snapcount = %v, want %v", cfg.snapCount, wcfg.snapCount)
+	}
+	if !reflect.DeepEqual(cfg.lpurls, wcfg.lpurls) {
+		t.Errorf("listen-peer-urls = %v, want %v", cfg.lpurls, wcfg.lpurls)
+	}
+	if !reflect.DeepEqual(cfg.lcurls, wcfg.lcurls) {
+		t.Errorf("listen-client-urls = %v, want %v", cfg.lcurls, wcfg.lcurls)
+	}
+}
+
+func TestConfigParsingClusteringFlags(t *testing.T) {
+	args := []string{
+		"-initial-cluster=0=http://localhost:8000",
+		"-initial-cluster-state=existing",
+		"-initial-cluster-token=etcdtest",
+		"-initial-advertise-peer-urls=http://localhost:8000,https://localhost:8001",
+		"-advertise-client-urls=http://localhost:7000,https://localhost:7001",
+		"-discovery-fallback=exit",
+	}
+	wcfg := NewConfig()
+	wcfg.apurls = []url.URL{{Scheme: "http", Host: "localhost:8000"}, {Scheme: "https", Host: "localhost:8001"}}
+	wcfg.acurls = []url.URL{{Scheme: "http", Host: "localhost:7000"}, {Scheme: "https", Host: "localhost:7001"}}
+	wcfg.clusterState.Set(clusterStateFlagExisting)
+	wcfg.fallback.Set(fallbackFlagExit)
+	wcfg.initialCluster = "0=http://localhost:8000"
+	wcfg.initialClusterToken = "etcdtest"
+
+	cfg := NewConfig()
+	err := cfg.Parse(args)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cfg.clusterState.String() != wcfg.clusterState.String() {
+		t.Errorf("clusterState = %v, want %v", cfg.clusterState, wcfg.clusterState)
+	}
+	if cfg.fallback.String() != wcfg.fallback.String() {
+		t.Errorf("fallback = %v, want %v", cfg.fallback, wcfg.fallback)
+	}
+	if cfg.initialCluster != wcfg.initialCluster {
+		t.Errorf("initialCluster = %v, want %v", cfg.initialCluster, wcfg.initialCluster)
+	}
+	if cfg.initialClusterToken != wcfg.initialClusterToken {
+		t.Errorf("initialClusterToken = %v, want %v", cfg.initialClusterToken, wcfg.initialClusterToken)
+	}
+	if !reflect.DeepEqual(cfg.apurls, wcfg.apurls) {
+		t.Errorf("initial-advertise-peer-urls = %v, want %v", cfg.lpurls, wcfg.lpurls)
+	}
+	if !reflect.DeepEqual(cfg.acurls, wcfg.acurls) {
+		t.Errorf("advertise-client-urls = %v, want %v", cfg.lcurls, wcfg.lcurls)
+	}
+}
+
+func TestConfigParsingOtherFlags(t *testing.T) {
+	args := []string{
+		"-proxy=readonly",
+		"-ca-file=cafile",
+		"-cert-file=certfile",
+		"-key-file=keyfile",
+		"-peer-ca-file=peercafile",
+		"-peer-cert-file=peercertfile",
+		"-peer-key-file=peerkeyfile",
+		"-force-new-cluster=true",
+	}
+
+	wcfg := NewConfig()
+	wcfg.proxy.Set(proxyFlagReadonly)
+	wcfg.clientTLSInfo.CAFile = "cafile"
+	wcfg.clientTLSInfo.CertFile = "certfile"
+	wcfg.clientTLSInfo.KeyFile = "keyfile"
+	wcfg.peerTLSInfo.CAFile = "peercafile"
+	wcfg.peerTLSInfo.CertFile = "peercertfile"
+	wcfg.peerTLSInfo.KeyFile = "peerkeyfile"
+	wcfg.forceNewCluster = true
+
+	cfg := NewConfig()
+	err := cfg.Parse(args)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if cfg.proxy.String() != wcfg.proxy.String() {
+		t.Errorf("proxy = %v, want %v", cfg.proxy, wcfg.proxy)
+	}
+	if cfg.clientTLSInfo.String() != wcfg.clientTLSInfo.String() {
+		t.Errorf("clientTLS = %v, want %v", cfg.clientTLSInfo, wcfg.clientTLSInfo)
+	}
+	if cfg.peerTLSInfo.String() != wcfg.peerTLSInfo.String() {
+		t.Errorf("peerTLS = %v, want %v", cfg.peerTLSInfo, wcfg.peerTLSInfo)
+	}
+	if cfg.forceNewCluster != wcfg.forceNewCluster {
+		t.Errorf("forceNewCluster = %t, want %t", cfg.forceNewCluster, wcfg.forceNewCluster)
+	}
+}
+
+func TestConfigParsingConflictClusteringFlags(t *testing.T) {
+	conflictArgs := [][]string{
+		[]string{
+			"-initial-cluster=0=localhost:8000",
+			"-discovery=http://example.com/abc",
+		},
+		[]string{
+			"-discovery-srv=example.com",
+			"-discovery=http://example.com/abc",
+		},
+		[]string{
+			"-initial-cluster=0=localhost:8000",
+			"-discovery-srv=example.com",
+		},
+		[]string{
+			"-initial-cluster=0=localhost:8000",
+			"-discovery=http://example.com/abc",
+			"-discovery-srv=example.com",
+		},
+	}
+
+	for i, tt := range conflictArgs {
+		cfg := NewConfig()
+		err := cfg.Parse(tt)
+		if err != ErrConflictBootstrapFlags {
+			t.Errorf("%d: err = %v, want %v", i, err, ErrConflictBootstrapFlags)
+		}
+	}
+}