diff --git a/consul/client_test.go b/consul/client_test.go
index 10ab0fde7f..4acc8e4b0a 100644
--- a/consul/client_test.go
+++ b/consul/client_test.go
@@ -173,11 +173,10 @@ func TestClient_RPC_TLS(t *testing.T) {
 		t.Fatalf("bad len")
 	}
 
+	time.Sleep(100 * time.Millisecond)
+
 	// RPC should succeed
-	testutil.WaitForResult(func() (bool, error) {
-		err := c1.RPC("Status.Ping", struct{}{}, &out)
-		return err == nil, err
-	}, func(err error) {
+	if err := c1.RPC("Status.Ping", struct{}{}, &out); err != nil {
 		t.Fatalf("err: %v", err)
-	})
+	}
 }
diff --git a/consul/server_test.go b/consul/server_test.go
index dc984ba35a..36b2b513c7 100644
--- a/consul/server_test.go
+++ b/consul/server_test.go
@@ -291,16 +291,13 @@ func TestServer_JoinLAN_TLS(t *testing.T) {
 		t.Fatalf("bad len")
 	})
 
-	// Verify Raft has established a peer
-	testutil.WaitForResult(func() (bool, error) {
-		return s1.Stats()["raft"]["num_peers"] == "1", nil
-	}, func(err error) {
-		t.Fatalf("no peer established")
-	})
+	time.Sleep(100 * time.Millisecond)
 
-	testutil.WaitForResult(func() (bool, error) {
-		return s2.Stats()["raft"]["num_peers"] == "1", nil
-	}, func(err error) {
-		t.Fatalf("no peer established")
-	})
+	// Verify Raft has established a peer
+	if s1.Stats()["raft"]["num_peers"] != "1" {
+		t.Fatalf("bad: %v", s1.Stats()["raft"])
+	}
+	if s2.Stats()["raft"]["num_peers"] != "1" {
+		t.Fatalf("bad: %v", s2.Stats()["raft"])
+	}
 }