--- a/tests/test_gpgmeh.py
+++ b/tests/test_gpgmeh.py
@@ -239,7 +239,7 @@
 
 
 class TestKey1:
-    def setup(self):
+    def setup_method(self):
         data = read_fixture_file("pubkey-1.asc")
         self.key = openpgpkey_from_data(data)
 
@@ -262,7 +262,7 @@
 
 
 class TestGetPublicKeyData:
-    def setup(self):
+    def setup_method(self):
         self.fname = get_fixture_file("pubkey-1.asc")
         original = open(self.fname, 'rb').read()
         # This should be a new, empty directory
@@ -275,7 +275,7 @@
     
         self.originalkey = openpgpkey_from_data(original)
 
-    def teardown(self):
+    def teardown_method(self):
         # shutil.rmtree(self.homedir)
         pass
 
@@ -308,7 +308,7 @@
 
 
 class TestGetUsableKeys:
-    def setup(self):
+    def setup_method(self):
         self.fname = get_fixture_file("pubkey-1.asc")
         original = open(self.fname, 'rb').read()
         # This should be a new, empty directory
@@ -321,7 +321,7 @@
     
         self.originalkey = openpgpkey_from_data(original)
 
-    def teardown(self):
+    def teardown_method(self):
         # shutil.rmtree(self.homedir)
         pass
 
@@ -340,7 +340,7 @@
 
 
 class TestGetUsableSecretKeys:
-    def setup(self):
+    def setup_method(self):
         self.fname = get_fixture_file("seckey-no-pw-1.asc")
         original = open(self.fname, 'rb').read()
         # This should be a new, empty directory
@@ -353,7 +353,7 @@
     
         self.originalkey = openpgpkey_from_data(original)
 
-    def teardown(self):
+    def teardown_method(self):
         # shutil.rmtree(self.homedir)
         pass
 
@@ -417,7 +417,7 @@
     SENDER_KEY = "seckey-no-pw-1.asc"
     RECEIVER_KEY = "seckey-no-pw-2.asc"
 
-    def setup(self):
+    def setup_method(self):
         # The "sender" sends its certificate to have it certified by the receiver
         self.key_sender_key = get_fixture_file(self.SENDER_KEY)
         # The "receiver" will receive the certificate, certify it, and send it back to the "sender"
@@ -430,7 +430,7 @@
         check_call(sender_gpgcmd + ["--import", self.key_sender_key])
         check_call(receiver_gpgcmd + ["--import", self.key_receiver_key])
 
-    def teardown(self):
+    def teardown_method(self):
         # shutil.rmtree(self.sender_homedir)
         # shutil.rmtree(self.receiver_homedir)
         pass
