diff --git a/tools/tests/Makefile b/tools/tests/x86_emulator/Makefile
similarity index 98%
rename from tools/tests/Makefile
rename to tools/tests/x86_emulator/Makefile
index afd3476277..d0bbe0ee83 100644
--- a/tools/tests/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -1,5 +1,5 @@
 
-XEN_ROOT=../..
+XEN_ROOT=../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET := test_x86_emulator
diff --git a/tools/tests/blowfish.c b/tools/tests/x86_emulator/blowfish.c
similarity index 100%
rename from tools/tests/blowfish.c
rename to tools/tests/x86_emulator/blowfish.c
diff --git a/tools/tests/blowfish.mk b/tools/tests/x86_emulator/blowfish.mk
similarity index 94%
rename from tools/tests/blowfish.mk
rename to tools/tests/x86_emulator/blowfish.mk
index 7847bc82de..85da259a5c 100644
--- a/tools/tests/blowfish.mk
+++ b/tools/tests/x86_emulator/blowfish.mk
@@ -1,5 +1,5 @@
 
-XEN_ROOT = ../..
+XEN_ROOT = ../../..
 CFLAGS =
 include $(XEN_ROOT)/tools/Rules.mk
 
diff --git a/tools/tests/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c
similarity index 100%
rename from tools/tests/test_x86_emulator.c
rename to tools/tests/x86_emulator/test_x86_emulator.c
diff --git a/tools/tests/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c
similarity index 100%
rename from tools/tests/x86_emulate.c
rename to tools/tests/x86_emulator/x86_emulate.c