diff --git a/tests/atf/Makefile b/tests/atf/Makefile
index fa9156f0e3a7..437a8dc765a9 100644
--- a/tests/atf/Makefile
+++ b/tests/atf/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2008/02/04 20:30:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2008/05/01 15:37:18 jmmv Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=	${TESTSBASE}/atf
 
-SUBDIR=	data formats sh_interface test_programs tools units
+SUBDIR=	atf-c atf-c++ atf-sh data formats test_programs tools
 
 SRCDIR=		${NETBSDSRCDIR}/dist/atf
 .PATH:		${SRCDIR}/tests/atf
diff --git a/tests/atf/units/Makefile b/tests/atf/atf-c++/Makefile
similarity index 58%
rename from tests/atf/units/Makefile
rename to tests/atf/atf-c++/Makefile
index 49224394fe1f..cbfeb74d902e 100644
--- a/tests/atf/units/Makefile
+++ b/tests/atf/atf-c++/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2008/02/04 20:30:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2008/05/01 15:37:18 jmmv Exp $
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/atf/units
+TESTSDIR=	${TESTSBASE}/atf/atf-c++
 
 SRCDIR=		${NETBSDSRCDIR}/dist/atf
-.PATH:		${SRCDIR}/tests/atf/units
+.PATH:		${SRCDIR}/tests/atf/atf-c++
 
 CPPFLAGS+=	-DHAVE_CONFIG_H
-CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libatfprivate # for config.h
-CPPFLAGS+=	-I${SRCDIR}/libs
+CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libatf-c
 
 TESTS_CXX=	t_config
 TESTS_CXX+=	t_env
 TESTS_CXX+=	t_expand
 TESTS_CXX+=	t_fs
 TESTS_CXX+=	t_io
+TESTS_CXX+=	t_macros
 TESTS_CXX+=	t_parser
-TESTS_CXX+=	t_sanity
 TESTS_CXX+=	t_signals
 TESTS_CXX+=	t_tests
 TESTS_CXX+=	t_text
diff --git a/tests/atf/atf-c/Makefile b/tests/atf/atf-c/Makefile
new file mode 100644
index 000000000000..b654cf97fc9a
--- /dev/null
+++ b/tests/atf/atf-c/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2008/05/01 15:37:18 jmmv Exp $
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/atf/atf-c
+
+SRCDIR=		${NETBSDSRCDIR}/dist/atf
+.PATH:		${SRCDIR}/tests/atf/atf-c
+
+CPPFLAGS+=	-DHAVE_CONFIG_H
+CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libatf-c
+
+TESTS_C=	t_config
+TESTS_C+=	t_dynstr
+TESTS_C+=	t_env
+TESTS_C+=	t_error
+TESTS_C+=	t_expand
+TESTS_C+=	t_fs
+TESTS_C+=	t_io
+TESTS_C+=	t_list
+TESTS_C+=	t_macros
+TESTS_C+=	t_map
+TESTS_C+=	t_sanity
+TESTS_C+=	t_signals
+TESTS_C+=	t_tc
+TESTS_C+=	t_tcr
+TESTS_C+=	t_text
+TESTS_C+=	t_ui
+TESTS_C+=	t_user
+
+.include <bsd.test.mk>
diff --git a/tests/atf/sh_interface/Makefile b/tests/atf/atf-sh/Makefile
similarity index 59%
rename from tests/atf/sh_interface/Makefile
rename to tests/atf/atf-sh/Makefile
index 17c38e81097b..5496a51c734c 100644
--- a/tests/atf/sh_interface/Makefile
+++ b/tests/atf/atf-sh/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2007/11/21 15:39:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2008/05/01 15:37:18 jmmv Exp $
 
 .include <bsd.own.mk>
 
-TESTSDIR=	${TESTSBASE}/atf/sh_interface
+TESTSDIR=	${TESTSBASE}/atf/atf-sh
 
 SRCDIR=		${NETBSDSRCDIR}/dist/atf
-.PATH:		${SRCDIR}/tests/atf/sh_interface
+.PATH:		${SRCDIR}/tests/atf/atf-sh
 
 TESTS_SH=	h_misc
 TESTS_SH+=	t_atf_check