diff --git a/test/functional/tests/cli/test_cleaning_policy.py b/test/functional/tests/cli/test_cleaning_policy.py
new file mode 100644
index 0000000..14b4ce0
--- /dev/null
+++ b/test/functional/tests/cli/test_cleaning_policy.py
@@ -0,0 +1,77 @@
+#
+# Copyright(c) 2022 Intel Corporation
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+import pytest
+import time
+
+from core.test_run_utils import TestRun
+from test_utils.size import Size, Unit
+from core.test_run import TestRun
+from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan
+from test_tools.fio.fio import Fio
+from test_tools.fio.fio_param import ReadWrite, IoEngine
+from api.cas import casadm
+from api.cas.cache_config import CacheMode, CleaningPolicy
+from test_utils.os_utils import Udev
+
+wait_time_s = 30
+
+
+@pytest.mark.CI
+@pytest.mark.require_disk("cache", DiskTypeSet([DiskType.optane, DiskType.nand]))
+@pytest.mark.require_disk("core", DiskTypeLowerThan("cache"))
+def test_cleaning_policy():
+    """
+    Title: test_cleaning_policy
+    description: | The test is to see if dirty data will be removed from the Cache
+    after changing the cleaning policy from NOP to one that expects a flush.
+    pass_criteria:
+        - Cache is successfully populated with dirty data
+        - Cleaning policy is changed successfully
+        - There is no dirty data after the policy change
+    """
+    with TestRun.step("Prepare devices."):
+        cache_disk = TestRun.disks["cache"]
+        cache_disk.create_partitions([Size(1, Unit.GibiByte)])
+        cache_dev = cache_disk.partitions[0]
+
+        core_disk = TestRun.disks["core"]
+        core_disk.create_partitions([Size(1, Unit.GibiByte)])
+        core_dev = core_disk.partitions[0]
+
+        cache = casadm.start_cache(cache_dev, cache_mode=CacheMode.WB)
+        cache.set_cleaning_policy(CleaningPolicy.nop)
+        core = cache.add_core(core_dev)
+        Udev.disable()
+
+    with TestRun.step("Populate cache with dirty data."):
+        fio = (
+            Fio()
+            .create_command()
+            .size(Size(1, Unit.MiB))
+            .read_write(ReadWrite.randwrite)
+            .io_engine(IoEngine.libaio)
+            .block_size(Size(1, Unit.Blocks4096))
+        )
+        fio.add_job("core0").target(core.path)
+        fio.run()
+
+        if cache.get_dirty_blocks() <= Size.zero():
+            TestRun.fail("Cache does not contain dirty data.")
+
+    with TestRun.step(f"Change cleaning policy and wait up to {wait_time_s} for flush"):
+        cache.set_cleaning_policy(CleaningPolicy.acp)
+        t_end = time.time() + wait_time_s
+        while time.time() < t_end:
+            time.sleep(1)
+            if cache.get_dirty_blocks() == Size.zero():
+                TestRun.LOGGER.info(
+                    f"Cache flushed after {round(time.time() - (t_end - wait_time_s), 2)} seconds."
+                )
+                break
+
+    with TestRun.step("Check if dirty data exists."):
+        if not cache.get_dirty_blocks() == Size.zero():
+            TestRun.fail("There is dirty data on cache after changing cleaning policy.")
diff --git a/test/functional/tests/lazy_writes/test_clean_load.py b/test/functional/tests/lazy_writes/test_clean_load.py
index 1bda675..a3c6373 100644
--- a/test/functional/tests/lazy_writes/test_clean_load.py
+++ b/test/functional/tests/lazy_writes/test_clean_load.py
@@ -26,11 +26,11 @@ def test_clean_load():
           - Occupancy and dirty statistics shouldn't change after reboot.
     """
     with TestRun.step("Prepare devices."):
-        cache_disk = TestRun.disks['cache']
+        cache_disk = TestRun.disks["cache"]
         cache_disk.create_partitions([Size(1, Unit.GibiByte)])
         cache_dev = cache_disk.partitions[0]
 
-        core_disk = TestRun.disks['core']
+        core_disk = TestRun.disks["core"]
         core_disk.create_partitions([Size(2, Unit.GibiByte)] * 2)
         core_devices = core_disk.partitions
 
@@ -45,11 +45,14 @@ def test_clean_load():
         cache.set_cleaning_policy(CleaningPolicy.nop)
 
     with TestRun.step("Populate cache with dirty data."):
-        fio = Fio().create_command()\
-            .size(Size(1, Unit.GibiByte))\
-            .read_write(ReadWrite.randwrite)\
-            .io_engine(IoEngine.libaio)\
+        fio = (
+            Fio()
+            .create_command()
+            .size(Size(1, Unit.GibiByte))
+            .read_write(ReadWrite.randwrite)
+            .io_engine(IoEngine.libaio)
             .block_size(Size(1, Unit.Blocks4096))
+        )
         for i, core in enumerate(cores):
             fio.add_job(f"core{i}").target(core.path)
         fio.run()
@@ -89,11 +92,14 @@ def test_clean_load():
         if occupancy_before == occupancy_after:
             TestRun.LOGGER.info("Cache occupancy statistics after reboot are the same.")
         else:
-            TestRun.LOGGER.error(f"Cache occupancy stats changed. Before: {occupancy_before} "
-                                 f"After: {occupancy_after}.")
+            TestRun.LOGGER.error(
+                f"Cache occupancy stats changed. Before: {occupancy_before} "
+                f"After: {occupancy_after}."
+            )
 
         if dirty_before == dirty_after:
             TestRun.LOGGER.info("Cache dirty statistics after reboot are the same.")
         else:
-            TestRun.LOGGER.error(f"Cache dirty stats changed. Before: {dirty_before} "
-                                 f"After: {dirty_after}.")
+            TestRun.LOGGER.error(
+                f"Cache dirty stats changed. Before: {dirty_before} " f"After: {dirty_after}."
+            )