diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
index d9c18e9a6..89e7e8c59 100644
--- a/tests/functional/__init__.py
+++ b/tests/functional/__init__.py
@@ -5,8 +5,8 @@
 class DatabaseUsingTest(object):
     _multiprocess_can_split_ = True
 
-    def setup(self):
+    def setup_method(self):
         self.sf = StateFile(db_file, writable=True)
 
-    def teardown(self):
+    def teardown_method(self):
         self.sf.close()
diff --git a/tests/functional/generic_deployment_test.py b/tests/functional/generic_deployment_test.py
index f1732c430..de2a73cf7 100644
--- a/tests/functional/generic_deployment_test.py
+++ b/tests/functional/generic_deployment_test.py
@@ -2,7 +2,7 @@
 
 
 class GenericDeploymentTest(DatabaseUsingTest):
-    def setup(self):
-        super(GenericDeploymentTest, self).setup()
+    def setup_method(self):
+        super(GenericDeploymentTest, self).setup_method()
         self.depl = self.sf.create_deployment()
         self.depl.logger.set_autoresponse("y")
diff --git a/tests/functional/single_machine_test.py b/tests/functional/single_machine_test.py
index f94444532..ada2ed47f 100644
--- a/tests/functional/single_machine_test.py
+++ b/tests/functional/single_machine_test.py
@@ -12,8 +12,8 @@
 class SingleMachineTest(GenericDeploymentTest):
     _multiprocess_can_split_ = True
 
-    def setup(self):
-        super(SingleMachineTest, self).setup()
+    def setup_method(self):
+        super(SingleMachineTest, self).setup_method()
         self.depl.network_expr = NetworkFile(logical_spec)
 
     def check_command(self, command):
diff --git a/tests/functional/test_invalid_identifier.py b/tests/functional/test_invalid_identifier.py
index 5498ba88a..072f771b9 100644
--- a/tests/functional/test_invalid_identifier.py
+++ b/tests/functional/test_invalid_identifier.py
@@ -12,8 +12,8 @@
 
 
 class TestInvalidIdentifier(GenericDeploymentTest):
-    def setup(self):
-        super(TestInvalidIdentifier, self).setup()
+    def setup_method(self):
+        super(TestInvalidIdentifier, self).setup_method()
         self.depl.network_expr = NetworkFile(logical_spec)
 
     def test_invalid_identifier_fails_evaluation(self):
diff --git a/tests/functional/test_rollback_rollsback.py b/tests/functional/test_rollback_rollsback.py
index e446dee95..c2b8c5c41 100644
--- a/tests/functional/test_rollback_rollsback.py
+++ b/tests/functional/test_rollback_rollsback.py
@@ -18,8 +18,8 @@
 class TestRollbackRollsback(SingleMachineTest):
     _multiprocess_can_split_ = True
 
-    def setup(self):
-        super(TestRollbackRollsback, self).setup()
+    def setup_method(self):
+        super(TestRollbackRollsback, self).setup_method()
         self.depl.network_expr = NetworkFile(rollback_spec)
         self.depl.nix_exprs = self.depl.nix_exprs + [rollback_spec]
 
diff --git a/tests/functional/test_send_keys_sends_keys.py b/tests/functional/test_send_keys_sends_keys.py
index da9dc0dda..d7437f171 100644
--- a/tests/functional/test_send_keys_sends_keys.py
+++ b/tests/functional/test_send_keys_sends_keys.py
@@ -11,8 +11,8 @@
 class TestSendKeysSendsKeys(SingleMachineTest):
     _multiprocess_can_split_ = True
 
-    def setup(self):
-        super(TestSendKeysSendsKeys, self).setup()
+    def setup_method(self):
+        super(TestSendKeysSendsKeys, self).setup_method()
         self.depl.nix_exprs = self.depl.nix_exprs + [
             secret_key_spec,
             elsewhere_key_spec,
diff --git a/tests/functional/test_ssh_key_pair_resource.py b/tests/functional/test_ssh_key_pair_resource.py
index b83661297..8325bb204 100644
--- a/tests/functional/test_ssh_key_pair_resource.py
+++ b/tests/functional/test_ssh_key_pair_resource.py
@@ -10,8 +10,8 @@
 
 
 class TestSSHKeyPairResource(GenericDeploymentTest):
-    def setup(self):
-        super(TestSSHKeyPairResource, self).setup()
+    def setup_method(self):
+        super(TestSSHKeyPairResource, self).setup_method()
         self.depl.network_expr = NetworkFile(ssh_key_pair_spec)
 
     def test_evaluate(self):