diff --git a/feedback/kafka_consumer_test.go b/feedback/kafka_consumer_test.go
index cbc0493..10c9634 100644
--- a/feedback/kafka_consumer_test.go
+++ b/feedback/kafka_consumer_test.go
@@ -242,7 +242,7 @@ var _ = Describe("Kafka Consumer", func() {
 					nil,
 				)
 				Expect(err).NotTo(HaveOccurred())
-				Eventually(client.msgChan, 10*time.Second).Should(Receive(Equal(&KafkaMessage{
+				Eventually(client.msgChan, 5*time.Millisecond, 100*time.Millisecond).Should(Receive(Equal(&KafkaMessage{
 					Game:     game,
 					Platform: platform,
 					Value:    value,
diff --git a/feedback/listener_test.go b/feedback/listener_test.go
index ffa8ff1..793dba4 100644
--- a/feedback/listener_test.go
+++ b/feedback/listener_test.go
@@ -229,7 +229,7 @@ var _ = Describe("Feedback Listener", func() {
 				})
 
 				It("should delete a batch of tokens from a single game", func() {
-					logger, _ := test.NewNullLogger()
+					logger := logrus.New()
 					logger.Level = logrus.DebugLevel
 
 					config.Set("feedbackListeners.queue.group", fmt.Sprintf("group-%s", uuid.NewV4().String()))