diff --git a/tests/test_core/test_account_id_resolution.py b/tests/test_core/test_account_id_resolution.py
index b181f1401..b4df22532 100644
--- a/tests/test_core/test_account_id_resolution.py
+++ b/tests/test_core/test_account_id_resolution.py
@@ -14,7 +14,7 @@ BASE_URL = f"http://localhost:{SERVER_PORT}/"
 
 
 class TestAccountIdResolution:
-    def setup(self):
+    def setup_method(self):
         if settings.TEST_SERVER_MODE:
             raise SkipTest(
                 "No point in testing this in ServerMode, as we already start our own server"
@@ -22,7 +22,7 @@ class TestAccountIdResolution:
         self.server = ThreadedMotoServer(port=SERVER_PORT, verbose=False)
         self.server.start()
 
-    def teardown(self):
+    def teardown_method(self):
         self.server.stop()
 
     def test_environment_variable_takes_precedence(self):
diff --git a/tests/test_core/test_backenddict.py b/tests/test_core/test_backenddict.py
index 1d7f557fb..a49302375 100644
--- a/tests/test_core/test_backenddict.py
+++ b/tests/test_core/test_backenddict.py
@@ -91,7 +91,7 @@ class TestMultiThreadedAccess:
             time.sleep(0.1)
             self.data = []
 
-    def setup(self):
+    def setup_method(self):
         self.backend = BackendDict(TestMultiThreadedAccess.SlowExampleBackend, "ec2")
 
     def test_access_a_slow_backend_concurrently(self):
diff --git a/tests/test_core/test_decorator_calls.py b/tests/test_core/test_decorator_calls.py
index 50bca20db..844f11b5c 100644
--- a/tests/test_core/test_decorator_calls.py
+++ b/tests/test_core/test_decorator_calls.py
@@ -126,7 +126,7 @@ class TestWithSetup_UppercaseU(unittest.TestCase):
 
 @mock_s3
 class TestWithSetup_LowercaseU:
-    def setup(self, *args):  # pylint: disable=unused-argument
+    def setup_method(self, *args):  # pylint: disable=unused-argument
         # This method will be executed automatically using pytest
         s3 = boto3.client("s3", region_name="us-east-1")
         s3.create_bucket(Bucket="mybucket")
diff --git a/tests/test_dynamodbstreams/test_dynamodbstreams.py b/tests/test_dynamodbstreams/test_dynamodbstreams.py
index 123b74505..2016d6424 100644
--- a/tests/test_dynamodbstreams/test_dynamodbstreams.py
+++ b/tests/test_dynamodbstreams/test_dynamodbstreams.py
@@ -10,7 +10,7 @@ class TestCore:
     stream_arn = None
     mocks = []
 
-    def setup(self):
+    def setup_method(self):
         self.mocks = [mock_dynamodb(), mock_dynamodbstreams()]
         for m in self.mocks:
             m.start()
@@ -30,7 +30,7 @@ class TestCore:
         )
         self.stream_arn = resp["TableDescription"]["LatestStreamArn"]
 
-    def teardown(self):
+    def teardown_method(self):
         conn = boto3.client("dynamodb", region_name="us-east-1")
         conn.delete_table(TableName="test-streams")
         self.stream_arn = None
@@ -196,12 +196,12 @@ class TestCore:
 class TestEdges:
     mocks = []
 
-    def setup(self):
+    def setup_method(self):
         self.mocks = [mock_dynamodb(), mock_dynamodbstreams()]
         for m in self.mocks:
             m.start()
 
-    def teardown(self):
+    def teardown_method(self):
         for m in self.mocks:
             try:
                 m.stop()
diff --git a/tests/test_emr/test_emr_integration.py b/tests/test_emr/test_emr_integration.py
index 51dbefc2e..5341e64f9 100644
--- a/tests/test_emr/test_emr_integration.py
+++ b/tests/test_emr/test_emr_integration.py
@@ -94,7 +94,7 @@ class TestEmrSecurityGroupManager(object):
 
     mocks = []
 
-    def setup(self):
+    def setup_method(self):
         self.mocks = [mock_ec2()]
         for mock in self.mocks:
             mock.start()
@@ -105,7 +105,7 @@ class TestEmrSecurityGroupManager(object):
         self.ec2 = ec2
         self.ec2_client = ec2_client
 
-    def teardown(self):
+    def teardown_method(self):
         for mock in self.mocks:
             mock.stop()
 
diff --git a/tests/test_s3/test_multiple_accounts_server.py b/tests/test_s3/test_multiple_accounts_server.py
index 323526f86..7a41b6a9a 100644
--- a/tests/test_s3/test_multiple_accounts_server.py
+++ b/tests/test_s3/test_multiple_accounts_server.py
@@ -10,7 +10,7 @@ BASE_URL = f"http://localhost:{SERVER_PORT}/"
 
 
 class TestAccountIdResolution:
-    def setup(self):
+    def setup_method(self):
         if settings.TEST_SERVER_MODE:
             raise SkipTest(
                 "No point in testing this in ServerMode, as we already start our own server"
@@ -18,7 +18,7 @@ class TestAccountIdResolution:
         self.server = ThreadedMotoServer(port=SERVER_PORT, verbose=False)
         self.server.start()
 
-    def teardown(self):
+    def teardown_method(self):
         self.server.stop()
 
     def test_with_custom_request_header(self):
diff --git a/tests/test_s3/test_s3_bucket_policy.py b/tests/test_s3/test_s3_bucket_policy.py
index 07944a952..f96ba8b54 100644
--- a/tests/test_s3/test_s3_bucket_policy.py
+++ b/tests/test_s3/test_s3_bucket_policy.py
@@ -13,7 +13,7 @@ class TestBucketPolicy:
         cls.server = ThreadedMotoServer(port="6000", verbose=False)
         cls.server.start()
 
-    def setup(self) -> None:
+    def setup_method(self) -> None:
         self.client = boto3.client(
             "s3", region_name="us-east-1", endpoint_url="http://localhost:6000"
         )
@@ -21,7 +21,7 @@ class TestBucketPolicy:
         self.client.put_object(Bucket="mybucket", Key="test_txt", Body=b"mybytes")
         self.key_name = "http://localhost:6000/mybucket/test_txt"
 
-    def teardown(self) -> None:
+    def teardown_method(self) -> None:
         self.client.delete_object(Bucket="mybucket", Key="test_txt")
         self.client.delete_bucket(Bucket="mybucket")