diff --git a/metropolis/node/core/consensus/BUILD.bazel b/metropolis/node/core/consensus/BUILD.bazel
index 06ccb12..d7b682b 100644
--- a/metropolis/node/core/consensus/BUILD.bazel
+++ b/metropolis/node/core/consensus/BUILD.bazel
@@ -25,6 +25,7 @@
 
 go_test(
     name = "go_default_test",
+    size = "small",
     srcs = [
         "consensus_test.go",
         "logparser_test.go",
diff --git a/metropolis/node/core/consensus/consensus_test.go b/metropolis/node/core/consensus/consensus_test.go
index 77ea63b..105b8eb 100644
--- a/metropolis/node/core/consensus/consensus_test.go
+++ b/metropolis/node/core/consensus/consensus_test.go
@@ -69,11 +69,7 @@
 }
 
 func waitEtcd(t *testing.T, s *Service) {
-	deadline := time.Now().Add(5 * time.Second)
 	for {
-		if time.Now().After(deadline) {
-			t.Fatalf("etcd did not start up on time")
-		}
 		if s.IsReady() {
 			break
 		}
@@ -224,11 +220,7 @@
 		t.Fatalf("cert revoke failed: %v", err)
 	}
 
-	deadline := time.Now().Add(5 * time.Second)
 	for {
-		if time.Now().After(deadline) {
-			t.Fatalf("CRL did not get updated in time")
-		}
 		time.Sleep(100 * time.Millisecond)
 
 		crlRaw, err := b.root.Data.Etcd.PeerCRL.Read()