Index: Makefile
===================================================================
--- Makefile	(revision 5f85c910c3b85368172260d2de0f5da623a4742b)
+++ Makefile	(revision 36a140b0bcc2aad4559358d768021df63fd67aa9)
@@ -65,4 +65,7 @@
 	DEFS += -DCONFIG_DEBUG_SPINLOCK
 endif
+ifeq ($(CONFIG_USERSPACE),y)
+	DEFS += -DCONFIG_USERSPACE
+endif
 
 ## Toolchain configuration
@@ -120,4 +123,12 @@
 	generic/src/fb/font-8x16.c
 
+## Test sources
+#
+
+ifneq ($(CONFIG_TEST),)
+	DEFS += -DCONFIG_TEST
+	GENERIC_SOURCES += test/$(CONFIG_TEST)/test.c
+endif
+
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
 ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))