diff --git a/fuelweb_test/tests/test_clone_env.py b/fuelweb_test/tests/test_clone_env.py
index e5747743c..59ec50c32 100644
--- a/fuelweb_test/tests/test_clone_env.py
+++ b/fuelweb_test/tests/test_clone_env.py
@@ -19,6 +19,7 @@ from proboscis.asserts import fail
 from proboscis import test
 from proboscis import SkipTest
 
+from fuelweb_test.helpers.decorators import log_snapshot_after_test
 from fuelweb_test.tests import base_test_case as base_test_data
 from fuelweb_test.tests.test_os_upgrade import TestOSupgrade as upgrade
 
@@ -28,6 +29,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_clone_environment"])
+    @log_snapshot_after_test
     def test_clone_environment(self):
         """Test clone environment
         Scenario:
@@ -113,6 +115,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_clone_nonexistent_cluster"])
+    @log_snapshot_after_test
     def test_clone_nonexistent_cluster(self):
         """Test clone environment with nonexistent cluster id as argument
         Scenario:
@@ -140,6 +143,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_clone_wo_name_in_body"])
+    @log_snapshot_after_test
     def test_clone_wo_name_in_body(self):
         """Test clone without name in POST body
         Scenario:
@@ -172,6 +176,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_clone_wo_release_id_in_body"])
+    @log_snapshot_after_test
     def test_clone_wo_release_id_in_body(self):
         """Test clone without release id in POST body
         Scenario:
@@ -201,6 +206,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_clone_with_empty_body"])
+    @log_snapshot_after_test
     def test_clone_with_empty_body(self):
         """Test clone with empty body
         Scenario:
@@ -226,6 +232,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_clone_with_nonexistent_release_id"])
+    @log_snapshot_after_test
     def test_clone_with_nonexistent_release_id(self):
         """Test clone with nonexistent release id in POST body
         Scenario:
@@ -257,6 +264,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_clone_with_incorrect_release_id"])
+    @log_snapshot_after_test
     def test_clone_with_incorrect_release_id(self):
         """Test clone with incorrect release id in POST body
         Scenario:
@@ -288,6 +296,7 @@ class TestCloneEnv(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["test_double_clone_environment"])
+    @log_snapshot_after_test
     def test_double_clone_environment(self):
         """Test double clone environment
         Scenario:
diff --git a/fuelweb_test/tests/test_node_reassignment.py b/fuelweb_test/tests/test_node_reassignment.py
index 48091b954..00c7a9222 100644
--- a/fuelweb_test/tests/test_node_reassignment.py
+++ b/fuelweb_test/tests/test_node_reassignment.py
@@ -18,6 +18,7 @@ from proboscis.asserts import assert_equal
 from proboscis.asserts import fail
 from proboscis import test
 from proboscis import SkipTest
+from fuelweb_test.helpers.decorators import log_snapshot_after_test
 
 from fuelweb_test.tests import base_test_case as base_test_data
 from fuelweb_test.tests.test_os_upgrade import TestOSupgrade as upgrade
@@ -28,6 +29,7 @@ class TestReassignNode(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["reassign_node_to_cloned_environment"])
+    @log_snapshot_after_test
     def reassign_node_to_cloned_environment(self):
         """Test reassign node
         Scenario:
@@ -108,6 +110,7 @@ class TestReassignNode(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["reassign_node_to_nonexistent_cluster"])
+    @log_snapshot_after_test
     def reassign_node_to_nonexistent_cluster(self):
         """Test reassign node to nonexistent cluster
         Scenario:
@@ -143,6 +146,7 @@ class TestReassignNode(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["reassign_node_with_empty_body"])
+    @log_snapshot_after_test
     def reassign_node_with_empty_body(self):
         """Test reassign node with empty body
         Scenario:
@@ -181,6 +185,7 @@ class TestReassignNode(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["reassign_node_with_incorrect_node"])
+    @log_snapshot_after_test
     def reassign_node_with_incorrect_node(self):
         """Test reassign node with incorrect node in POST body
         Scenario:
@@ -223,6 +228,7 @@ class TestReassignNode(base_test_data.TestBasic):
 
     @test(depends_on=[upgrade.upgrade_ha_ceph_for_all_ubuntu_neutron_vlan],
           groups=["reassign_nonexistent_node_to_cloned_environment"])
+    @log_snapshot_after_test
     def reassign_nonexistent_node_to_cloned_environment(self):
         """Test reassign node with nonexistent node in POST body
         Scenario: