diff --git a/tests/caps.py b/tests/caps.py
index fe90310..946a266 100644
--- a/tests/caps.py
+++ b/tests/caps.py
@@ -87,6 +87,11 @@
     logging.error("RESULT: " + str(flow_count) + " flows inserted")
     logging.error("RESULT: " + str(active_flows) + " flows reported")
 
+    # clean up and wait a bit in case the table is really big
+    rv = delete_all_flows(obj.controller)
+    time.sleep(flow_count / 100)
+
+
 
 class FillTableExact(base_tests.SimpleProtocol):
     """