diff --git a/qemu/tests/cfg/enospc.cfg b/qemu/tests/cfg/enospc.cfg
index 1393427a22214ed5089241613f92b57c8fb31c81..8c10b59823c4c344fd3ddc7b3c3511b00f3c2451 100644
--- a/qemu/tests/cfg/enospc.cfg
+++ b/qemu/tests/cfg/enospc.cfg
@@ -5,7 +5,7 @@
     images += " stg"
     drive_werror = stop
     drive_cache = none
-    image_name_stg = enospc
+    image_name_stg = images/enospc
     image_format_stg = qcow2
     image_boot_stg = no
     image_snapshot_stg = no
diff --git a/qemu/tests/enospc.py b/qemu/tests/enospc.py
index 03faafa2a1edc89a9ac4c47d3aa8eeb281dd09d9..490f47ef55973446e791399f0e90a7513bebe7ce 100644
--- a/qemu/tests/enospc.py
+++ b/qemu/tests/enospc.py
@@ -146,9 +146,9 @@ def run_enospc(test, params, env):
             for image_name in vm.params.objects("images"):
                 image_params = vm.params.object_params(image_name)
                 try:
-                    image = qemu_storage.QemuImg(image_params, test.bindir,
-                                               image_name)
-                    image.check_image(image_params, test.bindir)
+                    image = qemu_storage.QemuImg(image_params,
+                                  data_dir.get_data_dir(), image_name)
+                    image.check_image(image_params, data_dir.get_data_dir())
                 except (virt_vm.VMError, error.TestWarn), e:
                     logging.error(e)
             logging.info("Guest paused, extending Logical Volume size")