diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 615c77cf6b94..46b78a813453 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -568,12 +568,11 @@ options 	IPSTEALTH		#support for stealth forwarding
 options 	PFIL_HOOKS
 options 	TCPDEBUG
 
-# MBUF_FRAG_TEST option allows you to tell the IP stack to
-# fragment all outgoing packets into mbuf fragments of size
-# net.inet.ip.mbuf_frag_size (bytes).  It is used for testing
-# if network drivers can properly handle long chains of mbufs.
-# The sysctl is '0' (no fragmentation) by default.
-options		MBUF_FRAG_TEST
+# The MBUF_STRESS_TEST option enables options which create
+# various random failures / extreme cases related to mbuf
+# functions.  See the mbuf(9) manpage for a list of available
+# test cases.
+options		MBUF_STRESS_TEST
 
 # RANDOM_IP_ID causes the ID field in IP packets to be randomized
 # instead of incremented by 1 with each packet generated.  This
diff --git a/sys/conf/options b/sys/conf/options
index 05edb502243e..6782ebb82c22 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -362,7 +362,7 @@ SLIP_IFF_OPTS		opt_slip.h
 TCPDEBUG
 TCP_DROP_SYNFIN		opt_tcp_input.h
 XBONEHACK
-MBUF_FRAG_TEST		opt_mbuf_frag_test.h
+MBUF_STRESS_TEST		opt_mbuf_stress_test.h
 
 # Netgraph(4). Use option NETGRAPH to enable the base netgraph code.
 # Each netgraph node type can be either be compiled into the kernel
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index c303c93c6aed..1a28ed7d9c82 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -42,7 +42,7 @@
 #include "opt_mac.h"
 #include "opt_pfil_hooks.h"
 #include "opt_random_ip_id.h"
-#include "opt_mbuf_frag_test.h"
+#include "opt_mbuf_stress_test.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,7 +96,7 @@ static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options");
 
 u_short ip_id;
 
-#ifdef MBUF_FRAG_TEST
+#ifdef MBUF_STRESS_TEST
 int mbuf_frag_size = 0;
 SYSCTL_INT(_net_inet_ip, OID_AUTO, mbuf_frag_size, CTLFLAG_RW,
 	&mbuf_frag_size, 0, "Fragment outgoing mbufs to this size");
@@ -1020,7 +1020,7 @@ ip_output(m0, opt, ro, flags, imo, inp)
 		ipsec_delaux(m);
 #endif
 
-#ifdef MBUF_FRAG_TEST
+#ifdef MBUF_STRESS_TEST
 		if (mbuf_frag_size && m->m_pkthdr.len > mbuf_frag_size) {
 			struct mbuf *m1, *m2;
 			int length, tmp;