diff --git a/nodepool/tests/unit/test_driver_aws.py b/nodepool/tests/unit/test_driver_aws.py
index b2ed241a1..a48853839 100644
--- a/nodepool/tests/unit/test_driver_aws.py
+++ b/nodepool/tests/unit/test_driver_aws.py
@@ -160,6 +160,7 @@ class TestDriverAws(tests.DBTestCase):
 
         self.fake_aws = FakeAws()
         self.mock_aws.start()
+        self.addCleanup(self.mock_aws.stop)
 
         self.ec2 = boto3.resource('ec2', region_name='us-west-2')
         self.ec2_client = boto3.client('ec2', region_name='us-west-2')
@@ -212,10 +213,6 @@ class TestDriverAws(tests.DBTestCase):
         self.patchAdapter(ec2_quotas=getattr(test, '__aws_ec2_quotas__', None),
                           ebs_quotas=getattr(test, '__aws_ebs_quotas__', None))
 
-    def tearDown(self):
-        self.mock_aws.stop()
-        super().tearDown()
-
     def setup_config(self, *args, **kw):
         kw['subnet_id'] = self.subnet_id
         kw['security_group_id'] = self.security_group_id