diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go
index d73c4ece..bd00c143 100644
--- a/rpc/client/helpers.go
+++ b/rpc/client/helpers.go
@@ -72,9 +72,8 @@ func WaitForOneEvent(evsw types.EventSwitch,
 		evts <- data
 	})
 	// make sure to unregister after the test is over
-	// TODO: why doesn't the other call work???
-	// defer evsw.RemoveListenerForEvent(listener, evtTyp)
-	defer evsw.RemoveListener(listener)
+	defer evsw.RemoveListenerForEvent(evtTyp, listener)
+	// defer evsw.RemoveListener(listener)  // this also works
 
 	select {
 	case <-quit: