Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision c85a57f12649ef695469bac41ca451943f828502)
+++ HelenOS.config	(revision 865b9817d13bfe38c3c0832bbbb859184dcb2e71)
@@ -600,5 +600,5 @@
 ! CONFIG_WRITE_CORE_FILES (n/y)
 
-% Build userspace unit tests (PCUT)
+% Include userspace unit tests (PCUT)
 ! CONFIG_PCUT_TESTS (n/y)
 
Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision c85a57f12649ef695469bac41ca451943f828502)
+++ uspace/Makefile	(revision 865b9817d13bfe38c3c0832bbbb859184dcb2e71)
@@ -231,12 +231,9 @@
 	lib/usbvirt \
 	lib/pcm \
+	lib/pcut \
 	lib/bithenge \
 	lib/posix \
 	lib/mbr \
 	lib/gpt
-
-ifeq ($(CONFIG_PCUT_TESTS),y)
-	LIBS += lib/pcut
-endif
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))
Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision c85a57f12649ef695469bac41ca451943f828502)
+++ uspace/Makefile.common	(revision 865b9817d13bfe38c3c0832bbbb859184dcb2e71)
@@ -203,5 +203,4 @@
 
 # PCUT-based unit tests
-ifeq ($(CONFIG_PCUT_TESTS),y)
 ifneq ($(TEST_SOURCES),)
 	TEST_OUTPUT = $(TEST_BINARY)
@@ -213,5 +212,4 @@
 endif
 	TEST_OUTPUT_LIBS += $(TEST_LIBS)
-endif
 endif
 
@@ -357,5 +355,4 @@
 endif
 
-ifeq ($(CONFIG_PCUT_TESTS),y)
 ifneq ($(TEST_OUTPUT),)
 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
@@ -365,5 +362,4 @@
 endif
 endif
-endif
 
 %.o: %.S $(DEPEND)