diff --git a/tests/Makefile b/tests/Makefile
index de3e0b85b5..b6eacd637f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,6 +14,7 @@ EXPECT_BINS=\
 	setjmp \
 	signal \
 	stdio/all \
+	stdio/setvbuf \
 	stdio/freopen \
 	stdio/fwrite \
 	stdio/getc_unget \
diff --git a/tests/stdio/setvbuf.c b/tests/stdio/setvbuf.c
new file mode 100644
index 0000000000..62a13aeeb5
--- /dev/null
+++ b/tests/stdio/setvbuf.c
@@ -0,0 +1,14 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char ** argv) {
+	setvbuf(stdout, 0, _IONBF, 0);
+	FILE *f = fopen("stdio/stdio.in", "r");
+	setvbuf(f, 0, _IONBF, 0);
+	printf("%c\n", fgetc(f));
+	ungetc('H', f);
+	char *in = malloc(30);
+	printf("%s\n", fgets(in, 30, f));
+	printf("Hello\n");
+	return 0;
+}