diff --git a/qemu/tests/cfg/qemu_guest_agent.cfg b/qemu/tests/cfg/qemu_guest_agent.cfg
index 3ee6c052fa1a596558d2d4dc397d2bc949f28d3c..1ad6f34b1703df4e01ef449089bb1f2158129f3e 100644
--- a/qemu/tests/cfg/qemu_guest_agent.cfg
+++ b/qemu/tests/cfg/qemu_guest_agent.cfg
@@ -85,7 +85,7 @@
             gagent_check_type = memory_leak
             repeats = 1000000
             test_command = guest-info
-            memory_usage_cmd = "tasklist | findstr /I qemu-ga.exe" 
+            memory_usage_cmd = "tasklist | findstr /I qemu-ga.exe"
         - check_set_time:
             image_snapshot = yes
             gagent_check_type = set_time
@@ -139,6 +139,16 @@
         - gagent_check_after_init:
             no Windows
             gagent_check_type = after_init
+        - check_hotplug_frozen:
+            gagent_check_type = hotplug_frozen
+            images += " stg0"
+            boot_drive_stg0 = no
+            image_name_stg0 = images/storage0
+            image_size_stg0 = 1G
+            force_create_image_stg0 = yes
+            disk_write_cmd = "dd if=/dev/zero of=%s/file bs=1M count=4"
+            Windows:
+                disk_write_cmd = "cd %s:\ && echo test > a.txt"
     variants:
         - virtio_serial:
             gagent_serial_type = virtio
diff --git a/qemu/tests/qemu_guest_agent.py b/qemu/tests/qemu_guest_agent.py
index 8cdf4b447f4ff9f1d3b4cdabc4495ef755e8a579..6018355ecfe3d40634466a98ca311ece209656fc 100644
--- a/qemu/tests/qemu_guest_agent.py
+++ b/qemu/tests/qemu_guest_agent.py
@@ -13,6 +13,7 @@ from avocado.core import exceptions
 from virttest import error_context
 from virttest import guest_agent
 from virttest import utils_misc
+from virttest import utils_disk
 from virttest import env_process
 
 
@@ -942,6 +943,72 @@ class QemuGuestAgentBasicCheck(QemuGuestAgentTest):
             test.fail("Guest agent service is stopped after running init 3! It "
                       "should be running.")
 
+    @error_context.context_aware
+    def gagent_check_hotplug_frozen(self, test, params, env):
+        """
+        hotplug device with frozen fs
+
+        :param test: kvm test object
+        :param params: Dictionary with the test parameters
+        :param env: Dictionary with test environment
+        """
+        def get_new_disk(disks_before_plug, disks_after_plug):
+            """
+            Get the new added disks by comparing two disk lists.
+            """
+            disk = list(set(disks_after_plug).difference(set(disks_before_plug)))
+            return disk
+
+        session = self._get_session(params, self.vm)
+        image_size_stg0 = params["image_size_stg0"]
+        try:
+            if params.get("os_type") == "linux":
+                disks_before_plug = utils_disk.get_linux_disks(session, True)
+            error_context.context("Freeze guest fs", logging.info)
+            self.gagent.fsfreeze()
+            # For linux guest, waiting for it to be frozen, for windows guest,
+            # waiting for it to be automatically thawed.
+            time.sleep(20)
+            error_context.context("Hotplug a disk to guest", logging.info)
+            image_name_plug = params["images"].split()[1]
+            image_params_plug = params.object_params(image_name_plug)
+            devs = self.vm.devices.images_define_by_params(image_name_plug,
+                                                           image_params_plug,
+                                                           'disk')
+            for dev in devs:
+                self.vm.devices.simple_hotplug(dev, self.vm.monitor)
+            disk_write_cmd = params["disk_write_cmd"]
+            pause = float(params.get("virtio_block_pause", 10.0))
+            error_context.context("Format and write disk", logging.info)
+            if params.get("os_type") == "linux":
+                new_disks = utils_misc.wait_for(lambda: get_new_disk(disks_before_plug.keys(),
+                                                utils_disk.get_linux_disks(session, True).keys()), pause)
+                if not new_disks:
+                    test.fail("Can't detect the new hotplugged disks in guest")
+                try:
+                    mnt_point = utils_disk.configure_empty_disk(
+                        session, new_disks[0], image_size_stg0, "linux", labeltype="msdos")
+                except aexpect.ShellTimeoutError:
+                    self.gagent.fsthaw()
+                    mnt_point = utils_disk.configure_empty_disk(
+                        session, new_disks[0], image_size_stg0, "linux", labeltype="msdos")
+            elif params.get("os_type") == "windows":
+                disk_index = utils_misc.wait_for(
+                    lambda: utils_disk.get_windows_disks_index(session, image_size_stg0), 120)
+                if disk_index:
+                    mnt_point = utils_disk.configure_empty_disk(
+                        session, disk_index[0], image_size_stg0, "windows", labeltype="msdos")
+            session.cmd(disk_write_cmd % mnt_point[0])
+            error_context.context("Unplug the added disk", logging.info)
+            self.vm.devices.simple_unplug(devs[0], self.vm.monitor)
+        finally:
+            if self.gagent.get_fsfreeze_status() == self.gagent.FSFREEZE_STATUS_FROZEN:
+                self.gagent.fsthaw(check_status=False)
+            self.vm.verify_alive()
+            if params.get("os_type") == "linux":
+                utils_disk.umount(new_disks[0], mnt_point[0], session=session)
+            session.close()
+
     def run_once(self, test, params, env):
         QemuGuestAgentTest.run_once(self, test, params, env)