diff --git a/qemu/tests/cfg/qemu_iotests.cfg b/qemu/tests/cfg/qemu_iotests.cfg
index ef27d323871e7bf7aca76b7cc5c215e928ebb9d2..415a245f00148ac456c117f563a6fcecfc096d18 100644
--- a/qemu/tests/cfg/qemu_iotests.cfg
+++ b/qemu/tests/cfg/qemu_iotests.cfg
@@ -3,7 +3,7 @@
     vms = ''
     profilers = ''
     take_regular_screendumps = no
-    qemu_io_uri = git://git.kernel.org/pub/scm/linux/kernel/git/hch/qemu-iotests.git
+    qemu_io_uri = git://git.qemu.org/qemu.git
     qemu_io_branch = master
     qemu_io_lbranch = master
     #qemu_io_commit =
diff --git a/qemu/tests/qemu_iotests.py b/qemu/tests/qemu_iotests.py
index 82a40d7af657129d8cea9e1051c2e32df921d0f1..d94665947f4fb4857ea7dc5444d0a95f7078ec53 100644
--- a/qemu/tests/qemu_iotests.py
+++ b/qemu/tests/qemu_iotests.py
@@ -18,12 +18,13 @@ def run_qemu_iotests(test, params, env):
     :param env:    Dictionary with test environment.
     """
     # First, let's get qemu-io
-    std = "git://git.kernel.org/pub/scm/linux/kernel/git/hch/qemu-iotests.git"
+    std = "http://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
     uri = params.get("qemu_io_uri", std)
     branch = params.get("qemu_io_branch", 'master')
     lbranch = params.get("qemu_io_lbranch", 'master')
     commit = params.get("qemu_io_commit", None)
     base_uri = params.get("qemu_io_base_uri", None)
+    iotests_dir = params.get("qemu_iotests_dir", "tests/qemu-iotests")
     destination_dir = os.path.join(test.srcdir, "qemu_io_tests")
     git.get_repo(uri=uri, branch=branch, lbranch=lbranch, commit=commit,
                  destination_dir=destination_dir, base_uri=base_uri)
@@ -33,7 +34,8 @@ def run_qemu_iotests(test, params, env):
     os.environ["QEMU_IMG_PROG"] = utils_misc.get_qemu_img_binary(params)
     os.environ["QEMU_IO_PROG"] = utils_misc.get_qemu_io_binary(params)
 
-    os.chdir(destination_dir)
+    # qemu-iotests has merged into tests/qemu_iotests folder
+    os.chdir(os.path.join(destination_dir, iotests_dir))
     image_format = params["qemu_io_image_format"]
     extra_options = params.get("qemu_io_extra_options", "")