Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision c65590ae46aff47b0b8dfcf420b7e8a3ba47c748)
+++ defaults/amd64/Makefile.config	(revision 1aa9eff98036fa9bbde659542dbbfe03936724c8)
@@ -65,4 +65,7 @@
 CONFIG_BFB_BPP = 16
 
+# Include userspace unit tests (PCUT)
+CONFIG_PCUT_TESTS = y
+
 # Include development files (headers, libraries)
 CONFIG_DEVEL_FILES = y
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision c65590ae46aff47b0b8dfcf420b7e8a3ba47c748)
+++ defaults/ia32/Makefile.config	(revision 1aa9eff98036fa9bbde659542dbbfe03936724c8)
@@ -77,4 +77,7 @@
 CONFIG_USE_SHARED_LIBS = y
 
+# Include userspace unit tests (PCUT)
+CONFIG_PCUT_TESTS = y
+
 # Include development files (headers, libraries)
 CONFIG_DEVEL_FILES = y