diff --git a/src/tests/system/kernel/Jamfile b/src/tests/system/kernel/Jamfile
index 94c98c715f..a379b1c218 100644
--- a/src/tests/system/kernel/Jamfile
+++ b/src/tests/system/kernel/Jamfile
@@ -33,6 +33,8 @@ SimpleTest lock_node_test :
 	: be
 	;
 
+SimpleTest wait_test : wait_test.c ;
+
 SubInclude HAIKU_TOP src tests system kernel cache ;
 #SubInclude HAIKU_TOP src tests system kernel disk_device_manager ;
 SubInclude HAIKU_TOP src tests system kernel device_manager ;
diff --git a/src/tests/system/kernel/wait_test.c b/src/tests/system/kernel/wait_test.c
new file mode 100644
index 0000000000..38a8ff9858
--- /dev/null
+++ b/src/tests/system/kernel/wait_test.c
@@ -0,0 +1,19 @@
+/*
+*  Copyright 2007, Jérôme Duval. All rights reserved.
+*  Distributed under the terms of the MIT License.
+*  
+*/
+#include <sys/wait.h>
+#include <stdio.h>
+
+/**
+ * wait() doesn't return on Haiku, whereas it should return an error when the
+ * process has no children.
+ */
+
+int main() {
+	int child_status;
+	pid_t pid = wait(&child_status);
+	printf("wait returned %ld\n", pid);
+}
+