diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go
index <HASH>..<HASH> 100644
--- a/etcdmain/config_test.go
+++ b/etcdmain/config_test.go
@@ -460,8 +460,19 @@ func TestConfigFileElectionTimeout(t *testing.T) {
 		},
 		{
 			ElectionMs: 60000,
+			TickMs:     10000,
 			errStr:     "is too long, and should be set less than",
 		},
+		{
+			ElectionMs: 100,
+			TickMs:     0,
+			errStr:     "--heartbeat-interval must be >0 (set to 0ms)",
+		},
+		{
+			ElectionMs: 0,
+			TickMs:     100,
+			errStr:     "--election-timeout must be >0 (set to 0ms)",
+		},
 	}
 
 	for i, tt := range tests {
etcdmain: test wrong heartbeat-interval, election-timeout in TestConfigFileElectionTimeout