diff --git a/magnum/tests/functional/api/v1/test_bay.py b/magnum/tests/functional/api/v1/test_bay.py
index 00f734b..c8f5586 100755
--- a/magnum/tests/functional/api/v1/test_bay.py
+++ b/magnum/tests/functional/api/v1/test_bay.py
@@ -107,7 +107,7 @@ class BayTest(base.BaseTempestTest):
         self.bays.append(model.uuid)
         self.bay_uuid = model.uuid
         if config.Config.copy_logs:
-            self.addOnException(self.copy_logs_handler(
+            self.addCleanup(self.copy_logs_handler(
                 lambda: list(
                     [self._get_bay_by_id(self.bay_uuid)[1].master_addresses,
                      self._get_bay_by_id(self.bay_uuid)[1].node_addresses]),
diff --git a/magnum/tests/functional/api/v1/test_cluster.py b/magnum/tests/functional/api/v1/test_cluster.py
index 990cc41..fc2a148 100755
--- a/magnum/tests/functional/api/v1/test_cluster.py
+++ b/magnum/tests/functional/api/v1/test_cluster.py
@@ -107,7 +107,7 @@ class ClusterTest(base.BaseTempestTest):
         self.clusters.append(model.uuid)
         self.cluster_uuid = model.uuid
         if config.Config.copy_logs:
-            self.addOnException(self.copy_logs_handler(
+            self.addCleanup(self.copy_logs_handler(
                 lambda: list(
                     [self._get_cluster_by_id(model.uuid)[1].master_addresses,
                      self._get_cluster_by_id(model.uuid)[1].node_addresses]),
diff --git a/magnum/tests/functional/common/base.py b/magnum/tests/functional/common/base.py
index f29720e..f568cfb 100755
--- a/magnum/tests/functional/common/base.py
+++ b/magnum/tests/functional/common/base.py
@@ -42,11 +42,10 @@ class BaseMagnumTest(base.BaseTestCase):
                 [[master_nodes], [slave_nodes]].
         :param coe: the COE type of the nodes
         """
-        def int_copy_logs(exec_info):
+        def int_copy_logs():
             try:
                 cls.LOG.info("Copying logs...")
-                fn = exec_info[2].tb_frame.f_locals['fn']
-                func_name = fn.im_self._get_test_method().__name__
+                func_name = "test"
                 msg = ("Failed to copy logs for cluster")
                 nodes_addresses = get_nodes_fn()