diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index a6fee80ea7..62aa34af79 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -26,6 +26,7 @@ echo "Removing ovs bridge..."
 (docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \
     --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
     --ovs_all_ports) > /dev/null
+(docker exec -it openvswitch_vswitchd bash -c 'for br in `ovs-vsctl list-br`;do ovs-vsctl --if-exists del-br $br;done') > /dev/null
 fi
 
 echo "Stopping containers..."