diff --git a/tools/regression/lib/msun/Makefile b/tools/regression/lib/msun/Makefile
index d016986b07a6..de7a611bf5b2 100644
--- a/tools/regression/lib/msun/Makefile
+++ b/tools/regression/lib/msun/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-TESTS=	test-fenv test-ilogb test-lrint test-lround
+TESTS=	test-fenv test-ilogb test-lrint test-lround test-next
 CFLAGS+= -O0 -lm
 ARCH!=	uname -m
 .if ${ARCH} == "alpha"
diff --git a/tools/regression/lib/msun/test-next.c b/tools/regression/lib/msun/test-next.c
new file mode 100644
index 000000000000..c8dd0724a1a3
--- /dev/null
+++ b/tools/regression/lib/msun/test-next.c
@@ -0,0 +1,261 @@
+/*-
+ * Copyright (c) 2005 David Schultz <das@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Test the correctness of nextafter{,f,l} and nexttoward{,f,l}.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <fenv.h>
+#include <float.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifdef	__i386__
+#include <ieeefp.h>
+#endif
+
+#define	ALL_STD_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | FE_INVALID |\
+			 FE_OVERFLOW | FE_UNDERFLOW)
+#define	test(exp, ans, ex)	do {			\
+	double __ans = (ans);				\
+	feclearexcept(ALL_STD_EXCEPT);			\
+	_testl(#exp, __LINE__, (exp), __ans, (ex));	\
+} while (0)
+#define	testf(exp, ans, ex)	do {			\
+	float __ans = (ans);				\
+	feclearexcept(ALL_STD_EXCEPT);			\
+	_testl(#exp, __LINE__, (exp), __ans, (ex));	\
+} while (0)
+#define	testl(exp, ans, ex)	do {			\
+	long double __ans = (ans);			\
+	feclearexcept(ALL_STD_EXCEPT);			\
+	_testl(#exp, __LINE__, (exp), __ans, (ex));	\
+} while (0)
+#define	testboth(arg1, arg2, ans, ex, prec)	do {			\
+	test##prec(nextafter##prec((arg1), (arg2)), (ans), (ex));	\
+	test##prec(nexttoward##prec((arg1), (arg2)), (ans), (ex));	\
+} while (0)
+#define	testall(arg1, arg2, ans, ex)	do {		\
+	testboth((arg1), (arg2), (ans), (ex), );	\
+	testboth((arg1), (arg2), (ans), (ex), f);	\
+	testboth((arg1), (arg2), (ans), (ex), l);	\
+} while (0)
+
+static void _testl(const char *, int, long double, long double, int);
+static double idd(double);
+static float idf(float);
+
+int
+main(int argc, char *argv[])
+{
+	static const int ex_under = FE_UNDERFLOW | FE_INEXACT;	/* shorthand */
+	static const int ex_over = FE_OVERFLOW | FE_INEXACT;
+	long double ldbl_eps;
+
+	printf("1..5\n");
+
+#ifdef	__i386__
+	fpsetprec(FP_PE);
+#endif
+	/*
+	 * We can't use a compile-time constant here because gcc on
+	 * FreeBSD/i386 assumes long doubles are truncated to the
+	 * double format.
+	 */
+	ldbl_eps = ldexpl(1.0, LDBL_MIN_EXP - LDBL_MANT_DIG);
+
+	/*
+	 * Special cases involving zeroes.
+	 */
+#define	ztest(prec)							      \
+	test##prec(copysign##prec(1.0, nextafter##prec(0.0, -0.0)), -1.0, 0); \
+	test##prec(copysign##prec(1.0, nextafter##prec(-0.0, 0.0)), 1.0, 0);  \
+	test##prec(copysign##prec(1.0, nexttoward##prec(0.0, -0.0)), -1.0, 0);\
+	test##prec(copysign##prec(1.0, nexttoward##prec(-0.0, 0.0)), 1.0, 0)
+
+	ztest();
+	ztest(f);
+	ztest(l);
+#undef	ztest
+
+#define	stest(next, eps, prec)					\
+	test##prec(next(-0.0, 42.0), eps, ex_under);		\
+	test##prec(next(0.0, -42.0), -eps, ex_under);		\
+	test##prec(next(0.0, INFINITY), eps, ex_under);		\
+	test##prec(next(-0.0, -INFINITY), -eps, ex_under)
+
+	stest(nextafter, 0x1p-1074, );
+	stest(nextafterf, 0x1p-149f, f);
+	stest(nextafterl, ldbl_eps, l);
+	stest(nexttoward, 0x1p-1074, );
+	stest(nexttowardf, 0x1p-149f, f);
+	stest(nexttowardl, ldbl_eps, l);
+#undef	stest
+
+	printf("ok 1 - next\n");
+
+	/*
+	 * `x == y' and NaN tests
+	 */
+	testall(42.0, 42.0, 42.0, 0);
+	testall(-42.0, -42.0, -42.0, 0);
+	testall(INFINITY, INFINITY, INFINITY, 0);
+	testall(-INFINITY, -INFINITY, -INFINITY, 0);
+	testall(NAN, 42.0, NAN, 0);
+	testall(42.0, NAN, NAN, 0);
+	testall(NAN, NAN, NAN, 0);
+
+	printf("ok 2 - next\n");
+
+	/*
+	 * Tests where x is an ordinary normalized number
+	 */
+	testboth(1.0, 2.0, 1.0 + DBL_EPSILON, 0, );
+	testboth(1.0, -INFINITY, 1.0 - DBL_EPSILON/2, 0, );
+	testboth(1.0, 2.0, 1.0 + FLT_EPSILON, 0, f);
+	testboth(1.0, -INFINITY, 1.0 - FLT_EPSILON/2, 0, f);
+	testboth(1.0, 2.0, 1.0 + LDBL_EPSILON, 0, l);
+	testboth(1.0, -INFINITY, 1.0 - LDBL_EPSILON/2, 0, l);
+
+	testboth(-1.0, 2.0, -1.0 + DBL_EPSILON/2, 0, );
+	testboth(-1.0, -INFINITY, -1.0 - DBL_EPSILON, 0, );
+	testboth(-1.0, 2.0, -1.0 + FLT_EPSILON/2, 0, f);
+	testboth(-1.0, -INFINITY, -1.0 - FLT_EPSILON, 0, f);
+	testboth(-1.0, 2.0, -1.0 + LDBL_EPSILON/2, 0, l);
+	testboth(-1.0, -INFINITY, -1.0 - LDBL_EPSILON, 0, l);
+
+	/* Cases where nextafter(...) != nexttoward(...) */
+	test(nexttoward(1.0, 1.0 + LDBL_EPSILON), 1.0 + DBL_EPSILON, 0);
+	testf(nexttowardf(1.0, 1.0 + LDBL_EPSILON), 1.0 + FLT_EPSILON, 0);
+	testl(nexttowardl(1.0, 1.0 + LDBL_EPSILON), 1.0 + LDBL_EPSILON, 0);
+
+	printf("ok 3 - next\n");
+
+	/*
+	 * Tests at word boundaries, normalization boundaries, etc.
+	 */
+	testboth(0x1.87654ffffffffp+0, INFINITY, 0x1.87655p+0, 0, );
+	testboth(0x1.87655p+0, -INFINITY, 0x1.87654ffffffffp+0, 0, );
+	testboth(0x1.fffffffffffffp+0, INFINITY, 0x1p1, 0, );
+	testboth(0x1p1, -INFINITY, 0x1.fffffffffffffp+0, 0, );
+	testboth(0x0.fffffffffffffp-1022, INFINITY, 0x1p-1022, 0, );
+	testboth(0x1p-1022, -INFINITY, 0x0.fffffffffffffp-1022, ex_under, );
+
+	testboth(0x1.fffffep0f, INFINITY, 0x1p1, 0, f);
+	testboth(0x1p1, -INFINITY, 0x1.fffffep0f, 0, f);
+	testboth(0x0.fffffep-126f, INFINITY, 0x1p-126f, 0, f);
+	testboth(0x1p-126f, -INFINITY, 0x0.fffffep-126f, ex_under, f);
+
+#if LDBL_MANT_DIG == 53
+	testboth(0x1.87654ffffffffp+0L, INFINITY, 0x1.87655p+0L, 0, l);
+	testboth(0x1.87655p+0L, -INFINITY, 0x1.87654ffffffffp+0L, 0, l);
+	testboth(0x1.fffffffffffffp+0L, INFINITY, 0x1p1L, 0, l);
+	testboth(0x1p1L, -INFINITY, 0x1.fffffffffffffp+0L, 0, l);
+	testboth(0x0.fffffffffffffp-1022L, INFINITY, 0x1p-1022L, 0, l);
+	testboth(0x1p-1022L, -INFINITY, 0x0.fffffffffffffp-1022L, ex_under, l);
+#elif LDBL_MANT_DIG == 64
+	testboth(0x1.87654321fffffffep+0L, INFINITY, 0x1.87654322p+0L, 0, l);
+	testboth(0x1.87654322p+0L, -INFINITY, 0x1.87654321fffffffep+0L, 0, l);
+	testboth(0x1.fffffffffffffffep0L, INFINITY, 0x1p1L, 0, l);
+	testboth(0x1p1L, -INFINITY, 0x1.fffffffffffffffep0L, 0, l);
+	testboth(0x0.fffffffffffffffep-16382L, INFINITY, 0x1p-16382L, 0, l);
+	testboth(0x1p-16382L, -INFINITY,
+	    0x0.fffffffffffffffep-16382L, ex_under, l);
+#elif LDBL_MANT_DIG == 113
+	testboth(0x1.876543210987ffffffffffffffffp+0L, INFINITY,
+	    0x1.876543210988p+0, 0, l);
+	testboth(0x1.876543210988p+0L, -INFINITY,
+	    0x1.876543210987ffffffffffffffffp+0L, 0, l);
+	testboth(0x1.ffffffffffffffffffffffffffffp0L, INFINITY, 0x1p1L, 0, l);
+	testboth(0x1p1L, -INFINITY, 0x1.ffffffffffffffffffffffffffffp0L, 0, l);
+	testboth(0x0.ffffffffffffffffffffffffffffp-16382L, INFINITY,
+	    0x1p-16382L, 0, l);
+	testboth(0x1p-16382L, -INFINITY,
+	    0x0.ffffffffffffffffffffffffffffp-16382L, ex_under, l);
+#endif
+
+	printf("ok 4 - next\n");
+
+	/*
+	 * Overflow tests
+	 */
+	test(idd(nextafter(DBL_MAX, INFINITY)), INFINITY, ex_over);
+	test(idd(nextafter(INFINITY, 0.0)), DBL_MAX, 0);
+	test(idd(nexttoward(DBL_MAX, DBL_MAX * 2.0L)), INFINITY, ex_over);
+	test(idd(nexttoward(INFINITY, DBL_MAX * 2.0L)), DBL_MAX, 0);
+
+	testf(idf(nextafterf(FLT_MAX, INFINITY)), INFINITY, ex_over);
+	testf(idf(nextafterf(INFINITY, 0.0)), FLT_MAX, 0);
+	testf(idf(nexttowardf(FLT_MAX, FLT_MAX * 2.0)), INFINITY, ex_over);
+	testf(idf(nexttowardf(INFINITY, FLT_MAX * 2.0)), FLT_MAX, 0);
+
+	testboth(LDBL_MAX, INFINITY, INFINITY, ex_over, l);
+	testboth(INFINITY, 0.0, LDBL_MAX, 0, l);
+
+	printf("ok 5 - next\n");
+
+	return (0);
+}
+
+static void
+_testl(const char *exp, int line, long double actual, long double expected,
+    int except)
+{
+	int actual_except;
+
+	actual_except = fetestexcept(ALL_STD_EXCEPT);
+	if (actual != expected && !(isnan(actual) && isnan(expected))) {
+		fprintf(stderr, "%d: %s returned %La, expecting %La\n",
+		    line, exp, actual, expected);
+		abort();
+	}
+	if (actual_except != except) {
+		fprintf(stderr, "%d: %s raised 0x%x, expecting 0x%x\n",
+		    line, exp, actual_except, except);
+		abort();
+	}
+}
+
+/*
+ * The idd() and idf() routines ensure that doubles and floats are
+ * converted to their respective types instead of stored in the FPU
+ * with extra precision.
+ */
+static double
+idd(double x)
+{
+	return (x);
+}
+
+static float
+idf(float x)
+{
+	return (x);
+}
diff --git a/tools/regression/lib/msun/test-next.t b/tools/regression/lib/msun/test-next.t
new file mode 100644
index 000000000000..8bdfd03be81b
--- /dev/null
+++ b/tools/regression/lib/msun/test-next.t
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $FreeBSD$
+
+cd `dirname $0`
+
+executable=`basename $0 .t`
+
+make $executable 2>&1 > /dev/null
+
+exec ./$executable