diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index efd5b90685..37b9715010 100644
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -819,7 +819,9 @@ class TopoRouter(TopoGear):
         if memleak_file is None:
             return
 
-        self.stop()
+        self.stop(False, False)
+        self.stop(wait=True)
+
         self.logger.info("running memory leak report")
         self.tgen.net[self.name].report_memory_leaks(memleak_file, testname)