diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py
index 7f45fc199bf..49b1d0021d4 100644
--- a/tests/acceptance/cli_test.py
+++ b/tests/acceptance/cli_test.py
@@ -793,6 +793,9 @@ def test_build_rm(self):
         ]
         assert containers
 
+        for c in self.project.client.containers(all=True):
+            self.addCleanup(self.project.client.remove_container, c, force=True)
+
     def test_build_shm_size_build_option(self):
         pull_busybox(self.client)
         self.base_dir = 'tests/fixtures/build-shm-size'