diff --git a/tests/Makefile b/tests/Makefile
index 5c906befb4c7753df4f1f07c3da7b6d360b1c83f..dcea342362dbadc01638ac6729871a2112c1efba 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -13,9 +13,7 @@ EXPECT_BINS=\
 	fcntl \
 	fsync \
 	ftruncate \
-	getid \
 	getc_unget \
-	link \
 	locale \
 	math \
 	mem \
@@ -30,12 +28,10 @@ EXPECT_BINS=\
 	stdio/fwrite \
 	stdio/all \
 	stdio/freopen \
-	stdlib/bsearch \
 	stdlib/strtol \
 	stdlib/strtoul \
 	stdlib/a64l \
 	stdlib/rand \
-	stdlib/mktemp \
 	string/strncmp \
 	string/strcspn \
 	string/strchr \
@@ -46,7 +42,6 @@ EXPECT_BINS=\
 	string/strtok \
 	string/strtok_r \
 	unistd/getopt \
-	unlink \
 	waitpid \
 	write \
 	time \
@@ -60,7 +55,11 @@ BINS=\
 	chdir \
 	gethostname \
 	getid \
-	setid
+	link \
+	setid \
+	stdlib/bsearch \
+	stdlib/mktemp \
+	unlink
 
 all: $(BINS)
 
diff --git a/tests/expected/getid.stderr b/tests/expected/getid.stderr
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/expected/getid.stdout b/tests/expected/getid.stdout
deleted file mode 100644
index 204c54dfda2521cf50158b60a13f744fc95ec9d4..0000000000000000000000000000000000000000
--- a/tests/expected/getid.stdout
+++ /dev/null
@@ -1 +0,0 @@
-egid: 1000, euid: 1000, gid: 1000, pgid: 9363, pid: 10165, ppid 10121, uid 1000
diff --git a/tests/expected/link.stderr b/tests/expected/link.stderr
deleted file mode 100644
index 5ff5b2138a46b2b4910bcc29ec17eca617c67d3c..0000000000000000000000000000000000000000
--- a/tests/expected/link.stderr
+++ /dev/null
@@ -1 +0,0 @@
-link: Success
diff --git a/tests/expected/link.stdout b/tests/expected/link.stdout
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/expected/stdlib/bsearch.stderr b/tests/expected/stdlib/bsearch.stderr
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/expected/stdlib/bsearch.stdout b/tests/expected/stdlib/bsearch.stdout
deleted file mode 100644
index f2c934ddda22bdcba3f6118d5826193012d12b0c..0000000000000000000000000000000000000000
--- a/tests/expected/stdlib/bsearch.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-0x7ffd837cb514
-0x7ffd837cb518
-PASS bsearch
diff --git a/tests/expected/stdlib/mktemp.stderr b/tests/expected/stdlib/mktemp.stderr
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/tests/expected/stdlib/mktemp.stdout b/tests/expected/stdlib/mktemp.stdout
deleted file mode 100644
index 66174ea417c1184a7a4ad70bc40fd779d273cdf9..0000000000000000000000000000000000000000
--- a/tests/expected/stdlib/mktemp.stdout
+++ /dev/null
@@ -1 +0,0 @@
-tempXXsTJ4p
diff --git a/tests/expected/unlink.stderr b/tests/expected/unlink.stderr
deleted file mode 100644
index 4d72cf777b41203d1439e36f8e8e8508526b7005..0000000000000000000000000000000000000000
--- a/tests/expected/unlink.stderr
+++ /dev/null
@@ -1 +0,0 @@
-unlink: Success
diff --git a/tests/expected/unlink.stdout b/tests/expected/unlink.stdout
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000