diff --git a/tests/test_abi_compliance.py b/tests/test_abi_compliance.py
index 0436bbe1..2577533b 100644
--- a/tests/test_abi_compliance.py
+++ b/tests/test_abi_compliance.py
@@ -137,10 +137,6 @@ def test_abi_compliance(tmpdir, accelize_drm):
     """
     Test the ABI/API compliance of the lib_name.
     """
-    perform_once(__name__ + '.test_abi_compliance')
-
-
-
     if not accelize_drm.pytest_build_environment:
         pytest.skip('This test is only performed on build environment.')
     elif not accelize_drm.pytest_build_type == 'debug':
@@ -148,6 +144,8 @@ def test_abi_compliance(tmpdir, accelize_drm):
     elif not check_dump_abi():
         pytest.xfail('This test cannot be performed because ABI-Dumper app is not usable.')
 
+    perform_once(__name__ + '.test_abi_compliance')
+
     # Initialize test
     from concurrent.futures import ThreadPoolExecutor, as_completed
     build_tag_futures = []
diff --git a/tests/test_metered_mode_on_hw.py b/tests/test_metered_mode_on_hw.py
index 39aff1c3..aea13482 100644
--- a/tests/test_metered_mode_on_hw.py
+++ b/tests/test_metered_mode_on_hw.py
@@ -385,35 +385,35 @@ def test_metered_pause_resume_from_new_object(accelize_drm, conf_json, conf_json
         conf_json_second['settings'].update(logfile2.json)
         conf_json_second.save()
 
-        with accelize_drm.DrmManager(
+        drm_manager2 = accelize_drm.DrmManager(
                     conf_json_second.path,
                     cred_json.path,
                     driver.read_register_callback,
                     driver.write_register_callback,
                     async_cb.callback
-                ) as drm_manager2:
-            assert drm_manager1 != drm_manager2
-            assert drm_manager2.get('session_status')
-            assert drm_manager2.get('license_status')
-            activators.autotest(is_activated=True)
-            assert drm_manager2.get('session_id') == ''
-            # Resume session
-            drm_manager2.activate(True)
-            assert drm_manager2.get('session_status')
-            assert drm_manager2.get('license_status')
-            activators.autotest(is_activated=True)
-            activators.check_coin(drm_manager2.get('metered_data'))
-            # Wait for license renewal
-            sleep(lic_duration+2)
-            assert drm_manager2.get('session_id') == session_id
-            assert drm_manager2.get('license_duration') == lic_duration
-            activators.generate_coin()
-            activators.check_coin(drm_manager2.get('metered_data'))
-            drm_manager2.deactivate()
-            assert not drm_manager2.get('session_status')
-            assert not drm_manager2.get('license_status')
-            assert drm_manager2.get('session_id') == ''
-            activators.autotest(is_activated=False)
+                )
+        assert drm_manager1 != drm_manager2
+        assert drm_manager2.get('session_status')
+        assert drm_manager2.get('license_status')
+        activators.autotest(is_activated=True)
+        assert drm_manager2.get('session_id') == ''
+        # Resume session
+        drm_manager2.activate(True)
+        assert drm_manager2.get('session_status')
+        assert drm_manager2.get('license_status')
+        activators.autotest(is_activated=True)
+        activators.check_coin(drm_manager2.get('metered_data'))
+        # Wait for license renewal
+        sleep(lic_duration+2)
+        assert drm_manager2.get('session_id') == session_id
+        assert drm_manager2.get('license_duration') == lic_duration
+        activators.generate_coin()
+        activators.check_coin(drm_manager2.get('metered_data'))
+        drm_manager2.deactivate()
+        assert not drm_manager2.get('session_status')
+        assert not drm_manager2.get('license_status')
+        assert drm_manager2.get('session_id') == ''
+        activators.autotest(is_activated=False)
         logfile2.remove()
     logfile1.remove()
     async_cb.assert_NoError()