Index: head/tests/sys/mqueue/Makefile
===================================================================
--- head/tests/sys/mqueue/Makefile	(revision 282136)
+++ head/tests/sys/mqueue/Makefile	(revision 282137)
@@ -1,20 +1,22 @@
 # $FreeBSD$
 
 TESTSDIR=	${TESTSBASE}/sys/mqueue
 
 ATF_TESTS_SH=	mqueue_test
 
 BINDIR=		${TESTSDIR}
 
+CFLAGS+=	-I${.CURDIR:H:H}
+
 PROGS+=		mqtest1
 PROGS+=		mqtest2
 PROGS+=		mqtest3
 PROGS+=		mqtest4
 PROGS+=		mqtest5
 
 LDADD+=		-lrt
 DPADD+=		${LIBRT}
 
 WARNS?=		6
 
 .include <bsd.test.mk>
Index: head/tests/sys/mqueue/mqtest1.c
===================================================================
--- head/tests/sys/mqueue/mqtest1.c	(revision 282136)
+++ head/tests/sys/mqueue/mqtest1.c	(revision 282137)
@@ -1,53 +1,57 @@
 /* $FreeBSD$ */
 
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <mqueue.h>
 #include <signal.h>
 #include <stdio.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue1"
 
 int
 main(void)
 {
 	struct mq_attr attr, attr2;
 	struct sigevent sigev;
 	mqd_t mq;
 	int status;
+
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
 
 	attr.mq_maxmsg  = 2;
 	attr.mq_msgsize = 100;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
 	if (mq == (mqd_t)-1)
 		err(1, "mq_open");
 	status = mq_unlink(MQNAME);
 	if (status)
 		err(1, "mq_unlink");
 	status = mq_getattr(mq, &attr2);
 	if (status)
 		err(1, "mq_getattr");
 	if (attr.mq_maxmsg != attr2.mq_maxmsg)
 		err(1, "mq_maxmsg changed");
 	if (attr.mq_msgsize != attr2.mq_msgsize)
 		err(1, "mq_msgsize changed");
 
 	sigev.sigev_notify = SIGEV_SIGNAL;
 	sigev.sigev_signo = SIGRTMIN;
 	status = mq_notify(mq, &sigev);
 	if (status)
 		err(1, "mq_notify");
 	status = mq_notify(mq, &sigev);
 	if (status == 0)
 		err(1, "mq_notify 2");
 	else if (errno != EBUSY)
 		err(1, "mq_notify 3");
 	status = mq_notify(mq, NULL);
 	if (status)
 		err(1, "mq_notify 4");
 	status = mq_close(mq);
 	if (status)
 		err(1, "mq_close");
 	return (0);
 }
Index: head/tests/sys/mqueue/mqtest2.c
===================================================================
--- head/tests/sys/mqueue/mqtest2.c	(revision 282136)
+++ head/tests/sys/mqueue/mqtest2.c	(revision 282137)
@@ -1,97 +1,101 @@
 /* $FreeBSD$ */
 
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <fcntl.h>
 #include <mqueue.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue2"
 #define LOOPS	1000
 #define PRIO	10
 
 static void
 alarmhandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
 int
 main(void)
 {
 	struct mq_attr attr;
 	mqd_t mq;
 	int status;
 	pid_t pid;
+	
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
 	
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
 	if (mq == (mqd_t)-1)
 		err(1, "mq_open");
 	status = mq_getattr(mq, &attr);
 	if (status)
 		err(1, "mq_getattr");
 	pid = fork();
 	if (pid == 0) { /* child */
 		char *buf;
 		int j, i;
 		unsigned int prio;
 
 		mq_close(mq);
 
 		signal(SIGALRM, alarmhandler);
 
 		mq = mq_open(MQNAME, O_RDWR);
 		if (mq == (mqd_t)-1)
 			err(1, "child: mq_open");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			alarm(3);
 			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
 			if (status == -1)
 				err(2, "child: mq_receive");
 			for (i = 0; i < attr.mq_msgsize; ++i)
 				if (buf[i] != i)
 					err(3, "child: message data corrupted");
 			if (prio != PRIO)
 				err(4, "child: priority is incorrect: %d",
 					prio);
 		}
 		alarm(0);
 		free(buf);
 		mq_close(mq);
 		return (0);
 	} else if (pid == -1) {
 		err(1, "fork()");
 	} else {
 		char *buf;
 		int i, j;
 
 		signal(SIGALRM, alarmhandler);
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			for (i = 0; i < attr.mq_msgsize; ++i)
 				buf[i] = i;
 			alarm(3);
 			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
 			if (status)
 				err(1, "mq_send");
 		}
 		alarm(3);
 		wait(&status);
 		alarm(0);
 	}
 	status = mq_close(mq);
 	if (status)
 		err(1, "mq_close");
 	mq_unlink(MQNAME);
 	return (0);
 }
Index: head/tests/sys/mqueue/mqtest3.c
===================================================================
--- head/tests/sys/mqueue/mqtest3.c	(revision 282136)
+++ head/tests/sys/mqueue/mqtest3.c	(revision 282137)
@@ -1,112 +1,116 @@
 /* $FreeBSD$ */
 
 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <fcntl.h>
 #include <mqueue.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue3"
 #define LOOPS	1000
 #define PRIO	10
 
 static void
 sighandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
 int
 main(void)
 {
 	fd_set set;
 	struct mq_attr attr;
 	int status;
 	mqd_t mq;
 	pid_t pid;
+
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
 
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
 	if (mq == (mqd_t)-1)
 		err(1, "mq_open()");
 	status = mq_getattr(mq, &attr);
 	if (status)
 		err(1, "mq_getattr()");
 	
 	pid = fork();
 	if (pid == 0) { /* child */
 		char *buf;
 		int j, i;
 		unsigned int prio;
 
 		mq_close(mq);
 
 		signal(SIGALRM, sighandler);
 
 		mq = mq_open(MQNAME, O_RDWR);
 		if (mq == (mqd_t)-1)
 			err(1, "child process: mq_open");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			FD_ZERO(&set);
 			FD_SET(__mq_oshandle(mq), &set);
 			alarm(3);
 			status = select(__mq_oshandle(mq)+1, &set, NULL, NULL, NULL);
 			if (status != 1)
 				err(1, "child process: select()");
 			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
 			if (status == -1)
 				err(2, "child process: mq_receive");
 			for (i = 0; i < attr.mq_msgsize; ++i)
 				if (buf[i] != i)
 					err(3, "message data corrupted");
 			if (prio != PRIO)
 				err(4, "priority is incorrect: %d", prio);
 		}
 		alarm(0);
 		free(buf);
 		mq_close(mq);
 		return (0);
 	} else if (pid == -1) {
 		err(1, "fork()");
 	} else {
 		char *buf;
 		int i, j;
 
 		signal(SIGALRM, sighandler);
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			for (i = 0; i < attr.mq_msgsize; ++i) {
 				buf[i] = i;
 			}
 			alarm(3);
 			FD_ZERO(&set);
 			FD_SET(__mq_oshandle(mq), &set);
 			status = select(__mq_oshandle(mq)+1, NULL, &set, NULL, NULL);
 			if (status != 1)
 				err(1, "select()");
 			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
 			if (status) {
 				kill(pid, SIGKILL);
 				err(2, "mq_send()");
 			}
 		}
 		alarm(3);
 		wait(&status);
 		alarm(0);
 	}
 	status = mq_close(mq);
 	if (status)
 		err(1, "mq_close");
 	mq_unlink(MQNAME);
 	return (0);
 }
Index: head/tests/sys/mqueue/mqtest4.c
===================================================================
--- head/tests/sys/mqueue/mqtest4.c	(revision 282136)
+++ head/tests/sys/mqueue/mqtest4.c	(revision 282137)
@@ -1,116 +1,120 @@
 /* $FreeBSD$ */
 
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <fcntl.h>
 #include <mqueue.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue4"
 #define LOOPS	1000
 #define PRIO	10
 
 static void
 sighandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
 int
 main(void)
 {
 	struct kevent kev;
 	struct mq_attr attr;
 	mqd_t mq;
 	int kq, status;
 	pid_t pid;
+
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
 
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
 	if (mq == (mqd_t) -1)
 		err(1, "mq_open()");
 	status = mq_getattr(mq, &attr);
 	if (status)
 		err(1, "mq_getattr()");
 	pid = fork();
 	if (pid == 0) { /* child */
 		char *buf;
 		int j, i;
 		unsigned int prio;
 
 		mq_close(mq);
 		kq = kqueue();
 		mq = mq_open(MQNAME, O_RDWR);
 		if (mq == (mqd_t)-1)
 			err(1, "child: mq_open");
 		EV_SET(&kev, __mq_oshandle(mq), EVFILT_READ, EV_ADD, 0, 0, 0);
 		status = kevent(kq, &kev, 1, NULL, 0, NULL);
 		if (status == -1)
 			err(1, "child: kevent");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			alarm(3);
 			status = kevent(kq, NULL, 0, &kev, 1, NULL);
 			if (status != 1)
 				err(1, "child: kevent 2");
 			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
 			if (status == -1)
 				err(2, "child: mq_receive");
 			for (i = 0; i < attr.mq_msgsize; ++i)
 				if (buf[i] != i)
 					err(3, "child: message data corrupted");
 			if (prio != PRIO)
 				err(4, "child: priority is incorrect: %d",
 					 prio);
 		}
 		alarm(0);
 		free(buf);
 		mq_close(mq);
 		return (0);
 	} else if (pid == -1) {
 		err(1, "fork()");
 	} else {
 		char *buf;
 		int i, j;
 
 		signal(SIGALRM, sighandler);
 		kq = kqueue();
 		EV_SET(&kev, __mq_oshandle(mq), EVFILT_WRITE, EV_ADD, 0, 0, 0);
 		status = kevent(kq, &kev, 1, NULL, 0, NULL);
 		if (status == -1)
 			err(1, "kevent");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			for (i = 0; i < attr.mq_msgsize; ++i) {
 				buf[i] = i;
 			}
 			alarm(3);
 			status = kevent(kq, NULL, 0, &kev, 1, NULL);
 			if (status != 1)
 				err(1, "child: kevent 2");
 			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
 			if (status) {
 				err(2, "mq_send()");
 			}
 		}
 		free(buf);
 		alarm(3);
 		wait(&status);
 		alarm(0);
 	}
 	status = mq_close(mq);
 	if (status)
 		err(1, "mq_close");
 	mq_unlink(MQNAME);
 	return (0);
 }
Index: head/tests/sys/mqueue/mqtest5.c
===================================================================
--- head/tests/sys/mqueue/mqtest5.c	(revision 282136)
+++ head/tests/sys/mqueue/mqtest5.c	(revision 282137)
@@ -1,124 +1,128 @@
 /* $FreeBSD$ */
 
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <fcntl.h>
 #include <mqueue.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "freebsd_test_suite/macros.h"
+
 #define MQNAME	"/mytstqueue5"
 #define LOOPS	1000
 #define PRIO	10
 
 static void
 sighandler(int sig __unused)
 {
 	write(1, "timeout\n", 8);
 	_exit(1);
 }
 
 int
 main(void)
 {
 	int status;
 	struct mq_attr attr;
 	struct sigaction sa;
 	sigset_t set;
 	siginfo_t info;
 	mqd_t mq;
 	pid_t pid;
+
+	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
 
 	mq_unlink(MQNAME);
 
 	sigemptyset(&set);
 	sigaddset(&set, SIGRTMIN);
 	sigprocmask(SIG_BLOCK, &set, NULL);
 	sigemptyset(&sa.sa_mask);
 	sa.sa_flags = SA_SIGINFO;
 	sa.sa_sigaction = (void *) SIG_DFL;
 	sigaction(SIGRTMIN, &sa, NULL);
 
 	attr.mq_maxmsg  = 5;
 	attr.mq_msgsize = 128;
 	mq = mq_open(MQNAME, O_CREAT | O_RDWR | O_EXCL, 0666, &attr);
 	if (mq == (mqd_t)-1)
 		err(1, "mq_open()");
 	status = mq_getattr(mq, &attr);
 	if (status)
 		err(1, "mq_getattr()");
 	pid = fork();
 	if (pid == 0) { /* child */
 		int prio, j, i;
 		char *buf;
 		struct sigevent sigev;
 
 		signal(SIGALRM, sighandler);
 
 		sigev.sigev_notify = SIGEV_SIGNAL;
 		sigev.sigev_signo = SIGRTMIN;
 		sigev.sigev_value.sival_int = 2;
 
 		mq_close(mq);
 		mq = mq_open(MQNAME, O_RDWR | O_NONBLOCK);
 		if (mq == (mqd_t)-1)
 			err(1, "child: mq_open");
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			alarm(3);
 			status = mq_notify(mq, &sigev);
 			if (status)
 				err(1, "child: mq_notify");
 			status = sigwaitinfo(&set, &info);
 			if (status == -1)
 				err(1, "child: sigwaitinfo");
 			if (info.si_value.sival_int != 2)
 				err(1, "child: sival_int");
 			status = mq_receive(mq, buf, attr.mq_msgsize, &prio);
 			if (status == -1)
 				err(2, "child: mq_receive");
 			for (i = 0; i < attr.mq_msgsize; ++i)
 				if (buf[i] != i)
 					err(3, "child: message data corrupted");
 			if (prio != PRIO)
 				err(4, "child: priority is incorrect: %d",
 					 prio);
 		}
 		alarm(0);
 		free(buf);
 		mq_close(mq);
 		return (0);
 	} else if (pid == -1) {
 		err(1, "fork()");
 	} else {
 		char *buf;
 		int i, j;
 
 		signal(SIGALRM, sighandler);
 		buf = malloc(attr.mq_msgsize);
 		for (j = 0; j < LOOPS; ++j) {
 			for (i = 0; i < attr.mq_msgsize; ++i) {
 				buf[i] = i;
 			}
 			alarm(3);
 			status = mq_send(mq, buf, attr.mq_msgsize, PRIO);
 			if (status) {
 				kill(pid, SIGKILL);
 				err(2, "mq_send()");
 			}
 		}
 		alarm(3);
 		wait(&status);
 		alarm(0);
 	}
 	status = mq_close(mq);
 	if (status)
 		err(1, "mq_close");
 	mq_unlink(MQNAME);
 	return (0);
 }