6 files changed, 8 insertions, 28 deletions
diff --git a/tests/sys/mqueue/mqtest1.c b/tests/sys/mqueue/mqtest1.c
index 78acde1122ce..7f4ee74f9e8d 100644
--- a/tests/sys/mqueue/mqtest1.c
+++ b/tests/sys/mqueue/mqtest1.c
@@ -6,8 +6,6 @@
 #include <signal.h>
 #include <stdio.h>
 
-#include "freebsd_test_suite/macros.h"
-
 #define MQNAME	"/mytstqueue1"
 
 int
@@ -18,8 +16,6 @@ main(void)
 	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);
diff --git a/tests/sys/mqueue/mqtest2.c b/tests/sys/mqueue/mqtest2.c
index 08d4d9a8003a..efdca42eb37e 100644
--- a/tests/sys/mqueue/mqtest2.c
+++ b/tests/sys/mqueue/mqtest2.c
@@ -9,8 +9,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "freebsd_test_suite/macros.h"
-
 #define MQNAME	"/mytstqueue2"
 #define LOOPS	1000
 #define PRIO	10
@@ -29,9 +27,7 @@ main(void)
 	mqd_t mq;
 	int status;
 	pid_t pid;
-	
-	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
-	
+
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;
diff --git a/tests/sys/mqueue/mqtest3.c b/tests/sys/mqueue/mqtest3.c
index 65b8f4fcc2b9..b2c9155c37ba 100644
--- a/tests/sys/mqueue/mqtest3.c
+++ b/tests/sys/mqueue/mqtest3.c
@@ -10,8 +10,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "freebsd_test_suite/macros.h"
-
 #define MQNAME	"/mytstqueue3"
 #define LOOPS	1000
 #define PRIO	10
@@ -32,8 +30,6 @@ main(void)
 	mqd_t mq;
 	pid_t pid;
 
-	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
-
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;
diff --git a/tests/sys/mqueue/mqtest4.c b/tests/sys/mqueue/mqtest4.c
index 99841c670b5c..68648b01a9e4 100644
--- a/tests/sys/mqueue/mqtest4.c
+++ b/tests/sys/mqueue/mqtest4.c
@@ -11,8 +11,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "freebsd_test_suite/macros.h"
-
 #define MQNAME	"/mytstqueue4"
 #define LOOPS	1000
 #define PRIO	10
@@ -33,8 +31,6 @@ main(void)
 	int kq, status;
 	pid_t pid;
 
-	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
-
 	mq_unlink(MQNAME);
 
 	attr.mq_maxmsg  = 5;
diff --git a/tests/sys/mqueue/mqtest5.c b/tests/sys/mqueue/mqtest5.c
index f48ef1121289..6671839829bf 100644
--- a/tests/sys/mqueue/mqtest5.c
+++ b/tests/sys/mqueue/mqtest5.c
@@ -11,8 +11,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "freebsd_test_suite/macros.h"
-
 #define MQNAME	"/mytstqueue5"
 #define LOOPS	1000
 #define PRIO	10
@@ -35,8 +33,6 @@ main(void)
 	mqd_t mq;
 	pid_t pid;
 
-	PLAIN_REQUIRE_KERNEL_MODULE("mqueuefs", 0);
-
 	mq_unlink(MQNAME);
 
 	sigemptyset(&set);
diff --git a/tests/sys/mqueue/mqueue_test.sh b/tests/sys/mqueue/mqueue_test.sh
index 8b3f45159ad9..4f947dc260ed 100644
--- a/tests/sys/mqueue/mqueue_test.sh
+++ b/tests/sys/mqueue/mqueue_test.sh
@@ -27,7 +27,7 @@
 
 mqtest1_head()
 {
-	:
+	atf_set require.kmods mqueuefs
 }
 mqtest1_body()
 {
@@ -36,7 +36,7 @@ mqtest1_body()
 
 mqtest2_head()
 {
-	:
+	atf_set require.kmods mqueuefs
 }
 mqtest2_body()
 {
@@ -45,7 +45,7 @@ mqtest2_body()
 
 mqtest3_head()
 {
-	:
+	atf_set require.kmods mqueuefs
 }
 mqtest3_body()
 {
@@ -54,7 +54,7 @@ mqtest3_body()
 
 mqtest4_head()
 {
-	:
+	atf_set require.kmods mqueuefs
 }
 mqtest4_body()
 {
@@ -63,7 +63,7 @@ mqtest4_body()
 
 mqtest5_head()
 {
-	:
+	atf_set require.kmods mqueuefs
 }
 mqtest5_body()
 {
@@ -74,7 +74,7 @@ atf_init_test_cases()
 {
 	atf_add_test_case mqtest1
 	atf_add_test_case mqtest2
-	#atf_add_test_case mqtest3
-	#atf_add_test_case mqtest4
+	atf_add_test_case mqtest3
+	atf_add_test_case mqtest4
 	atf_add_test_case mqtest5
 }