diff --git a/Kconfig b/Kconfig
index 48a80be..def32a0 100644
--- a/Kconfig
+++ b/Kconfig
@@ -30,3 +30,5 @@
 source "lib/Kconfig"
 
 source "lib/Kconfig.debug"
+
+source "test/Kconfig"
diff --git a/Makefile b/Makefile
index 69fa5c0..bfcfbe3 100644
--- a/Makefile
+++ b/Makefile
@@ -966,7 +966,7 @@
 
 
 ifeq ($(KBUILD_EXTMOD),)
-core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
+core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ test/
 
 vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \