diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 529103c..5992eba 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -712,6 +712,7 @@
         for onos in onos_list:
             Container.dckr.kill(onos)
             Container.dckr.remove_container(onos, force=True)
+        Onos.cleanup_runtime()
 
     return 0