diff --git a/stand/usb/Makefile.test b/stand/usb/test/Makefile
similarity index 91%
rename from stand/usb/Makefile.test
rename to stand/usb/test/Makefile
index 4d7a0733c224..c82b5bac3823 100644
--- a/stand/usb/Makefile.test
+++ b/stand/usb/test/Makefile
@@ -30,6 +30,7 @@
 #
 
 .PATH: ${.CURDIR}
+.SUFFIXES: .a
 
 PROG=	usbloader
 SRCS= 
@@ -45,12 +46,15 @@ LDFLAGS+= -Wl,--gc-sections
 
 SRCS+=	bsd_usbloader_test.c
 
-LDADD+=	libusbboot.a
-DPADD+= libusbboot.a
+USBLIB?= ${.OBJDIR}/../libusbboot.a
+
+LDADD+= ${USBLIB}
+DPADD+= ${USBLIB}
+
+MAN=
 
 .include <bsd.prog.mk>
 
-${PROG}: libusbboot.a
+${USBLIB}:
+	make -C ${.CURDIR}/.. USBCOREDIR=${.CURDIR}/..
 
-libusbboot.a:
-	make -f Makefile
diff --git a/stand/usb/bsd_usbloader_test.c b/stand/usb/test/bsd_usbloader_test.c
similarity index 100%
rename from stand/usb/bsd_usbloader_test.c
rename to stand/usb/test/bsd_usbloader_test.c