Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -5,11 +5,12 @@
 	  terminal
 
 CLEAN = EBOOT.PBP		\
 	boot.dol		\
 	${PROG_NOINST}.arm9	\
-	${PROG_NOINST}.nds
+	${PROG_NOINST}.nds	\
+	${PROG_NOINST}.nro
 DISTCLEAN = Info.plist
 
 PROG_NOINST = tests${PROG_SUFFIX}
 STATIC_LIB_NOINST = ${TESTS_STATIC_LIB}
 SRCS = ForwardingTests.m		\
@@ -192,10 +193,13 @@
 
 boot.dol: ${PROG_NOINST}
 	elf2dol ${PROG_NOINST} $@
 
 ${PROG_NOINST}: ${LIBOBJFW_DEP} ${LIBOBJFWRT_DEP}
+
+${PROG_NOINST}.3dsx: ${PROG_NOINST}
+	3dsxtool $< $@
 
 ${PROG_NOINST}.arm9: ${PROG_NOINST}
 	arm-none-eabi-objcopy -O binary $< $@
 
 ${PROG_NOINST}.nds: ${PROG_NOINST}.arm9
@@ -203,13 +207,13 @@
 	mkdir -p nds-data
 	cp testfile.bin testfile.txt testfile.ini serialization.xml nds-data
 	ndstool -c $@ -9 $< -d nds-data
 	rm -fr nds-data
 
-${PROG_NOINST}.3dsx: ${PROG_NOINST}
-	3dsxtool $< $@
+${PROG_NOINST}.nro: ${PROG_NOINST}
+	elf2nro $< $@
 
 CPPFLAGS += -I../src -I../src/exceptions -I../src/runtime -I.. -DSTDOUT
 OBJCFLAGS_RuntimeARCTests.m = -fobjc-arc -fobjc-arc-exceptions
 LIBS := ${TESTS_LIBS} ${LIBS}
 LDFLAGS += ${MAP_LDFLAGS}
 LD = ${OBJC}