diff --git a/repos/base-sel4/src/test/sel4/target.mk b/repos/base-sel4/src/test/sel4/target.mk
index 1ab703b221..a517e54248 100644
--- a/repos/base-sel4/src/test/sel4/target.mk
+++ b/repos/base-sel4/src/test/sel4/target.mk
@@ -1,7 +1,35 @@
 TARGET = test-sel4
 SRC_CC = main.cc context_area.cc mini_env.cc thread.cc
 
-LIBS   = base-common core_printf syscall
+LIBS   = core_printf syscall
+
+#
+# Equivalent to base-common library, excluding some parts that would conflict
+# with the minimalistic root-task environment (e.g., thread.cc)
+#
+LIBS += cxx startup
+
+SRC_CC += ipc/ipc.cc ipc/pager.cc
+SRC_CC += avl_tree/avl_tree.cc
+SRC_CC += allocator/slab.cc
+SRC_CC += allocator/allocator_avl.cc
+SRC_CC += heap/heap.cc heap/sliced_heap.cc
+SRC_CC += console/console.cc
+SRC_CC += child/child.cc
+SRC_CC += process/process.cc
+SRC_CC += elf/elf_binary.cc
+SRC_CC += lock/lock.cc
+SRC_CC += signal/signal.cc signal/common.cc
+SRC_CC += server/server.cc
+SRC_CC += thread/trace.cc
+SRC_CC += thread/context_allocator.cc
+
+INC_DIR +=  $(REP_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/thread
+
+vpath %.cc $(REP_DIR)/src/base
+vpath %.cc $(BASE_DIR)/src/base
 
 vpath %.cc $(BASE_DIR)/src