diff --git a/tests/lib/libc/Makefile b/tests/lib/libc/Makefile
index d9c5cd170d50..f50ca0494f4d 100644
--- a/tests/lib/libc/Makefile
+++ b/tests/lib/libc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/01/12 17:32:27 pgoyette Exp $
+# $NetBSD: Makefile,v 1.31 2011/01/12 19:44:07 pgoyette Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>
@@ -24,13 +24,11 @@ TESTS_C+=	t_ptm
 TESTS_C+=	t_randomid
 TESTS_C+=	t_strptime
 
-TESTS_SH+=	t_atexit
 TESTS_SH+=	t_nsdispatch
 
 BINDIR=		${TESTSDIR}
 MKMAN=		no
 
-PROGS+=		h_atexit
 PROGS+=		h_nsd_recurse
 
 LDADD.h_nsd_recurse+=	-lpthread
diff --git a/tests/lib/libc/stdlib/Makefile b/tests/lib/libc/stdlib/Makefile
index dd583e7c6736..a5c40e491d5a 100644
--- a/tests/lib/libc/stdlib/Makefile
+++ b/tests/lib/libc/stdlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/01/01 23:56:49 pgoyette Exp $
+# $NetBSD: Makefile,v 1.8 2011/01/12 19:44:08 pgoyette Exp $
 
 .include <bsd.own.mk>
 
@@ -11,12 +11,14 @@ TESTS_C+=	t_mi_vector_hash
 TESTS_C+=	t_posix_memalign
 TESTS_C+=	t_strtox
 
+TESTS_SH+=	t_atexit
 TESTS_SH+=	t_getopt        
 
 MKMAN=no
 
 BINDIR=		${TESTSDIR}
 
+PROGS+=		h_atexit
 PROGS+=		h_getopt h_getopt_long
 
 LDADD.t_environment_pth=	-pthread
diff --git a/tests/lib/libc/h_atexit.c b/tests/lib/libc/stdlib/h_atexit.c
similarity index 97%
rename from tests/lib/libc/h_atexit.c
rename to tests/lib/libc/stdlib/h_atexit.c
index 7acb4d8d0e0e..b2f91c4c5fe2 100644
--- a/tests/lib/libc/h_atexit.c
+++ b/tests/lib/libc/stdlib/h_atexit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: h_atexit.c,v 1.1 2011/01/03 19:01:47 pgoyette Exp $ */
+/* $NetBSD: h_atexit.c,v 1.1 2011/01/12 19:44:08 pgoyette Exp $ */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2011\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: h_atexit.c,v 1.1 2011/01/03 19:01:47 pgoyette Exp $");
+__RCSID("$NetBSD: h_atexit.c,v 1.1 2011/01/12 19:44:08 pgoyette Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/lib/libc/t_atexit.sh b/tests/lib/libc/stdlib/t_atexit.sh
similarity index 96%
rename from tests/lib/libc/t_atexit.sh
rename to tests/lib/libc/stdlib/t_atexit.sh
index 2bbbb96f82db..d11268bed091 100644
--- a/tests/lib/libc/t_atexit.sh
+++ b/tests/lib/libc/stdlib/t_atexit.sh
@@ -1,4 +1,4 @@
-# $NetBSD: t_atexit.sh,v 1.1 2011/01/03 19:01:47 pgoyette Exp $
+# $NetBSD: t_atexit.sh,v 1.1 2011/01/12 19:44:08 pgoyette Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.