diff --git a/test/functional/swift_test_client.py b/test/functional/swift_test_client.py
index 7d08e1f2ee..3c9bb0b5e2 100644
--- a/test/functional/swift_test_client.py
+++ b/test/functional/swift_test_client.py
@@ -460,6 +460,7 @@ class Account(Base):
     def delete_containers(self):
         for c in listing_items(self.containers):
             cont = self.container(c)
+            cont.update_metadata(hdrs={'x-versions-location': ''})
             if not cont.delete_recursive():
                 return False