diff --git a/tests/unit/test_gerrit_awskinesis.py b/tests/unit/test_gerrit_awskinesis.py
index 7b56b008df..40cb85e500 100644
--- a/tests/unit/test_gerrit_awskinesis.py
+++ b/tests/unit/test_gerrit_awskinesis.py
@@ -50,12 +50,9 @@ class TestGerritEventSourceAWSKinesis(ZuulTestCase):
                 'StreamMode': 'ON_DEMAND'
             }
         )
+        self.addCleanup(self.mock_aws.stop)
         super().setUp()
 
-    def tearDown(self):
-        self.mock_aws.stop()
-        super().tearDown()
-
     @simple_layout('layouts/simple.yaml')
     def test_kinesis(self):
         listener = self.fake_gerrit.event_thread