diff --git a/tools/test/bin/onos-mininet b/tools/test/bin/onos-mininet
index 4ce341e..5256166 100755
--- a/tools/test/bin/onos-mininet
+++ b/tools/test/bin/onos-mininet
@@ -68,6 +68,6 @@
     ;;
 cleanup)
     ssh -t -t $remote sudo mn -c
-    ssh -t -t $remote "ps -ef | grep 'tail -n1 screenlog.0' | grep -v grep | cut -c10-15 | xargs kill -9"
+    ssh -t -t $remote "screen -list | grep mininet | cut -d. -f1 | tr -d '\t' | xargs kill -9; screen -wipe; exit 0"
     ;;
 esac