diff --git a/swarm/pss/pss.go b/swarm/pss/pss.go
index e80812cd3e..ad8dda7982 100644
--- a/swarm/pss/pss.go
+++ b/swarm/pss/pss.go
@@ -514,10 +514,7 @@ func (p *Pss) isSelfPossibleRecipient(msg *PssMsg, prox bool) bool {
 	po, _ := p.Kademlia.Pof(p.Kademlia.BaseAddr(), msg.To, 0)
 	log.Trace("selfpossible", "po", po, "depth", depth)
 
-	if po <= depth {
-		return true
-	}
-	return false
+	return depth <= po
 }
 
 /////////////////////////////////////////////////////////////////////
diff --git a/swarm/pss/pss_test.go b/swarm/pss/pss_test.go
index 92fd10d0d7..32404aaaf9 100644
--- a/swarm/pss/pss_test.go
+++ b/swarm/pss/pss_test.go
@@ -55,8 +55,7 @@ import (
 
 var (
 	initOnce        = sync.Once{}
-	debugdebugflag  = flag.Bool("vv", false, "veryverbose")
-	debugflag       = flag.Bool("v", false, "verbose")
+	loglevel        = flag.Int("loglevel", 2, "logging verbosity")
 	longrunning     = flag.Bool("longrunning", false, "do run long-running tests")
 	w               *whisper.Whisper
 	wapi            *whisper.PublicWhisperAPI
@@ -79,16 +78,9 @@ func init() {
 func initTest() {
 	initOnce.Do(
 		func() {
-			loglevel := log.LvlInfo
-			if *debugflag {
-				loglevel = log.LvlDebug
-			} else if *debugdebugflag {
-				loglevel = log.LvlTrace
-			}
-
 			psslogmain = log.New("psslog", "*")
 			hs := log.StreamHandler(os.Stderr, log.TerminalFormat(true))
-			hf := log.LvlFilterHandler(loglevel, hs)
+			hf := log.LvlFilterHandler(log.Lvl(*loglevel), hs)
 			h := log.CallerFileHandler(hf)
 			log.Root().SetHandler(h)