diff --git a/Makefile.am b/Makefile.am
index 8354f52..21e874a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,10 @@ VLIBC_CORE_SRCS = \
     src/stdlib/rand.c \
     src/stdlib/qsort.c \
     src/stdlib/div.c \
-    src/stdlib/inttypes.c
+    src/stdlib/inttypes.c \
+    src/stdlib/env.c \
+    src/stdlib/multibyte.c \
+    src/stdlib/mkstemp.c
 
 # Profile-gated sources, EXISTING gates preserved (strlcpy/strlcat stay L2
 # BSD, strcasestr stays L3 GNU — NOT promoted). Task 8/9 additions: stpcpy.c
@@ -100,7 +103,8 @@ VLIBC_CORE_SRCS = \
 VLIBC_LEVEL2_SRCS = src/string/strlcpy.c src/string/strlcat.c \
     src/string/stpcpy.c src/string/memccpy.c \
     src/ctype/isascii.c src/ctype/toascii.c \
-    src/string/strings_impl.c
+    src/string/strings_impl.c \
+    src/stdlib/pty.c src/stdlib/getsubopt.c
 VLIBC_LEVEL3_SRCS = src/string/strcasestr.c
 
 vlibc_lib_LTLIBRARIES = libvlibc.la
@@ -274,7 +278,7 @@ VLIBC_TEST_CFLAGS = -DVLIBC_LEVEL=$(VLIBC_TEST_LEVEL) -fno-stack-protector \
 
 check_PROGRAMS = test_syscall test_strerror test_setjmp test_headers \
     test_startup test_malloc test_string test_ctype test_strings \
-    test_strtol test_qsort test_inttypes
+    test_strtol test_qsort test_inttypes test_env
 
 test_syscall_SOURCES = tests/syscall_test.c
 test_syscall_CFLAGS = $(VLIBC_TEST_CFLAGS)
@@ -348,15 +352,21 @@ test_inttypes_DEPENDENCIES = crt1.o libvlibc-check.a
 test_inttypes_LINK = $(VLIBC_TEST_LINK)
 test_inttypes_LDADD = $(VLIBC_TEST_LDADD)
 
+test_env_SOURCES = tests/test_env.c
+test_env_CFLAGS = $(VLIBC_TEST_CFLAGS)
+test_env_DEPENDENCIES = crt1.o libvlibc-check.a
+test_env_LINK = $(VLIBC_TEST_LINK)
+test_env_LDADD = $(VLIBC_TEST_LDADD)
+
 # test_startup's default mode exits 42 by design, so it is NOT a bare TESTS
 # entry; tests/startup_modes.sh runs its full mode matrix and the -f failure
 # scenarios of the other binaries. test_malloc/test_string/test_ctype/
-# test_strings/test_strtol/test_qsort/test_inttypes default to the happy mode
-# (exit 0 on all-pass) and are bare TESTS entries; their -f/-p modes stay
-# runnable by hand.
+# test_strings/test_strtol/test_qsort/test_inttypes/test_env default to the
+# happy mode (exit 0 on all-pass) and are bare TESTS entries; their -f/-p
+# modes stay runnable by hand.
 TESTS = test_syscall test_strerror test_setjmp test_headers \
     test_malloc test_string test_ctype test_strings \
-    test_strtol test_qsort test_inttypes \
+    test_strtol test_qsort test_inttypes test_env \
     tests/startup_modes.sh
 
 CLEANFILES = crt1.o libvlibc-check.a $(VLIBC_CHECK_OBJECTS)