diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile
index 89393d06c..a52986048 100644
--- a/src/arch/i386/Makefile
+++ b/src/arch/i386/Makefile
@@ -84,6 +84,7 @@ endif
 #
 SRCDIRS		+= arch/i386/core
 SRCDIRS		+= arch/i386/image
+SRCDIRS		+= arch/i386/tests
 SRCDIRS		+= arch/i386/interface/syslinux
 
 # Include common x86 Makefile
diff --git a/src/tests/comboot/shuffle-simple.asm b/src/arch/i386/tests/comboot/shuffle-simple.asm
similarity index 99%
rename from src/tests/comboot/shuffle-simple.asm
rename to src/arch/i386/tests/comboot/shuffle-simple.asm
index efc7d9b46..8ede8d097 100644
--- a/src/tests/comboot/shuffle-simple.asm
+++ b/src/arch/i386/tests/comboot/shuffle-simple.asm
@@ -2,7 +2,7 @@
 	org 100h
 
 	jmp start
-	
+
 shuffle_start:
 	push 0xB800
 	pop es
diff --git a/src/tests/comboot/version.asm b/src/arch/i386/tests/comboot/version.asm
similarity index 100%
rename from src/tests/comboot/version.asm
rename to src/arch/i386/tests/comboot/version.asm
diff --git a/src/tests/gdbstub_test.S b/src/arch/i386/tests/gdbstub_test.S
similarity index 100%
rename from src/tests/gdbstub_test.S
rename to src/arch/i386/tests/gdbstub_test.S
diff --git a/src/tests/gdbstub_test.gdb b/src/arch/i386/tests/gdbstub_test.gdb
similarity index 100%
rename from src/tests/gdbstub_test.gdb
rename to src/arch/i386/tests/gdbstub_test.gdb