diff --git a/Makefile.inc1 b/Makefile.inc1
index 1eb8835a2d7..77985fca5af 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -127,12 +127,12 @@ BUILD_ARCH!=	sysctl -n hw.machine_arch
 .error To cross-build, set TARGET_ARCH.
 .endif
 .endif
-.if ${MACHINE} == ${TARGET}
+.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING)
 OBJTREE=	${MAKEOBJDIRPREFIX}
 .else
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}
 .endif
-WORLDTMP=	${OBJTREE}${.CURDIR}/${MACHINE_ARCH}
+WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
 # /usr/games added for fortune which depend on strfile
 BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
diff --git a/tools/build/Makefile b/tools/build/Makefile
index be1de32d75c..b523f139536 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -23,4 +23,8 @@ INCS+=		nl_types.h
 SRCS=		dummy.c
 .endif
 
+.if defined(CROSS_BUILD_TESTING)
+SUBDIR=		cross-build
+.endif
+
 .include <bsd.lib.mk>
diff --git a/tools/build/cross-build/Makefile b/tools/build/cross-build/Makefile
new file mode 100644
index 00000000000..69c1e9c4984
--- /dev/null
+++ b/tools/build/cross-build/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NO_OBJ=
+SCRIPTS=	date.sh hostname.sh
+BINDIR=		/usr/bin
+
+.include <bsd.prog.mk>
diff --git a/tools/build/cross-build/date.sh b/tools/build/cross-build/date.sh
new file mode 100644
index 00000000000..f697a7f0cd5
--- /dev/null
+++ b/tools/build/cross-build/date.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+exec /bin/date -r0 "$@"
diff --git a/tools/build/cross-build/hostname.sh b/tools/build/cross-build/hostname.sh
new file mode 100644
index 00000000000..855741beca8
--- /dev/null
+++ b/tools/build/cross-build/hostname.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+echo dummy