diff --git a/plugins/outputs/riemann/riemann_test.go b/plugins/outputs/riemann/riemann_test.go
index 67a161be5..0b7c85403 100644
--- a/plugins/outputs/riemann/riemann_test.go
+++ b/plugins/outputs/riemann/riemann_test.go
@@ -193,17 +193,6 @@ func TestConnectAndWrite(t *testing.T) {
 	err = r.Write(metrics)
 	require.NoError(t, err)
 
-	start := time.Now()
-	for true {
-		events, _ := r.client.Query(`tagged "docker"`)
-		if len(events) > 0 {
-			break
-		}
-		if time.Since(start) > time.Second {
-			break
-		}
-	}
-
 	// are there any "docker" tagged events in Riemann?
 	events, err := r.client.Query(`tagged "docker"`)
 	require.NoError(t, err)