diff --git a/pkg/tools/fake_etcd_client.go b/pkg/tools/fake_etcd_client.go
index 3a6be8b9b29..d4ae285e3a8 100644
--- a/pkg/tools/fake_etcd_client.go
+++ b/pkg/tools/fake_etcd_client.go
@@ -41,6 +41,7 @@ type FakeEtcdClient struct {
 	Err         error
 	t           TestLogger
 	Ix          int
+	TestIndex   bool
 	ChangeIndex uint64
 
 	// Will become valid after Watch is called; tester may write to it. Tester may
@@ -72,6 +73,10 @@ func MakeFakeEtcdClient(t TestLogger) *FakeEtcdClient {
 }
 
 func (f *FakeEtcdClient) generateIndex() uint64 {
+	if !f.TestIndex {
+		return 0
+	}
+
 	f.ChangeIndex++
 	return f.ChangeIndex
 }