diff --git a/qemu/deps/cpu_flags/cpu_map.xml b/deps/cpu_flags/cpu_map.xml
similarity index 100%
rename from qemu/deps/cpu_flags/cpu_map.xml
rename to deps/cpu_flags/cpu_map.xml
diff --git a/qemu/deps/cpu_flags/src/Makefile b/deps/cpu_flags/src/Makefile
similarity index 100%
rename from qemu/deps/cpu_flags/src/Makefile
rename to deps/cpu_flags/src/Makefile
diff --git a/qemu/deps/cpu_flags/src/aes.c b/deps/cpu_flags/src/aes.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/aes.c
rename to deps/cpu_flags/src/aes.c
diff --git a/qemu/deps/cpu_flags/src/avx.c b/deps/cpu_flags/src/avx.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/avx.c
rename to deps/cpu_flags/src/avx.c
diff --git a/qemu/deps/cpu_flags/src/cpuflags-test.c b/deps/cpu_flags/src/cpuflags-test.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/cpuflags-test.c
rename to deps/cpu_flags/src/cpuflags-test.c
diff --git a/qemu/deps/cpu_flags/src/fma4.c b/deps/cpu_flags/src/fma4.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/fma4.c
rename to deps/cpu_flags/src/fma4.c
diff --git a/qemu/deps/cpu_flags/src/pclmul.c b/deps/cpu_flags/src/pclmul.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/pclmul.c
rename to deps/cpu_flags/src/pclmul.c
diff --git a/qemu/deps/cpu_flags/src/rdrand.c b/deps/cpu_flags/src/rdrand.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/rdrand.c
rename to deps/cpu_flags/src/rdrand.c
diff --git a/qemu/deps/cpu_flags/src/sse3.c b/deps/cpu_flags/src/sse3.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/sse3.c
rename to deps/cpu_flags/src/sse3.c
diff --git a/qemu/deps/cpu_flags/src/sse4.c b/deps/cpu_flags/src/sse4.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/sse4.c
rename to deps/cpu_flags/src/sse4.c
diff --git a/qemu/deps/cpu_flags/src/sse4a.c b/deps/cpu_flags/src/sse4a.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/sse4a.c
rename to deps/cpu_flags/src/sse4a.c
diff --git a/qemu/deps/cpu_flags/src/ssse3.c b/deps/cpu_flags/src/ssse3.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/ssse3.c
rename to deps/cpu_flags/src/ssse3.c
diff --git a/qemu/deps/cpu_flags/src/stress.c b/deps/cpu_flags/src/stress.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/stress.c
rename to deps/cpu_flags/src/stress.c
diff --git a/qemu/deps/cpu_flags/src/stressmem.c b/deps/cpu_flags/src/stressmem.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/stressmem.c
rename to deps/cpu_flags/src/stressmem.c
diff --git a/qemu/deps/cpu_flags/src/tests.h b/deps/cpu_flags/src/tests.h
similarity index 100%
rename from qemu/deps/cpu_flags/src/tests.h
rename to deps/cpu_flags/src/tests.h
diff --git a/qemu/deps/cpu_flags/src/xop.c b/deps/cpu_flags/src/xop.c
similarity index 100%
rename from qemu/deps/cpu_flags/src/xop.c
rename to deps/cpu_flags/src/xop.c
diff --git a/provider/cpuflags.py b/provider/cpuflags.py
index 70255cf3c425e06dee7344614b2930d82d07d2bd..370f6ea721b58d8986fa358d09930b868d93756a 100644
--- a/provider/cpuflags.py
+++ b/provider/cpuflags.py
@@ -16,7 +16,8 @@ def install_cpuflags_util_on_vm(test, vm, dst_dir, extra_flags=None):
     if not extra_flags:
         extra_flags = ""
 
-    cpuflags_src = os.path.join(data_dir.get_deps_dir(), "cpu_flags")
+    cpuflags_src = os.path.join(data_dir.get_deps_dir("cpu_flags"),
+                                "cpu_flags")
     cpuflags_dst = os.path.join(dst_dir, "cpu_flags")
     session = vm.wait_for_login()
     session.cmd("rm -rf %s" %
@@ -24,7 +25,7 @@ def install_cpuflags_util_on_vm(test, vm, dst_dir, extra_flags=None):
     session.cmd("sync")
     vm.copy_files_to(cpuflags_src, dst_dir)
     session.cmd("sync")
-    session.cmd("cd %s; make EXTRA_FLAGS='%s';" %
+    session.cmd("cd %s; cd src; make EXTRA_FLAGS='%s';" %
                (cpuflags_dst, extra_flags))
     session.cmd("sync")
     session.close()