@@ -200,20 +200,28 @@
 	3dsxtool $< $@
 
 ${PROG_NOINST}.arm9: ${PROG_NOINST}
 	arm-none-eabi-objcopy -O binary $< $@
 
-${PROG_NOINST}.nds: ${PROG_NOINST}.arm9
+${PROG_NOINST}.nds: ${PROG_NOINST}.arm9 testfile.bin testfile.txt testfile.ini
+${PROG_NOINST}.nds: serialization.xml
 	rm -fr nds-data
 	mkdir -p nds-data
 	cp testfile.bin testfile.txt testfile.ini serialization.xml nds-data
-	ndstool -c $@ -9 $< -d nds-data
+	ndstool -c $@ -9 ${PROG_NOINST} -d nds-data
 	rm -fr nds-data
 
-${PROG_NOINST}.nro: ${PROG_NOINST}
-	elf2nro $< $@
+${PROG_NOINST}.nro: ${PROG_NOINST} testfile.bin testfile.txt testfile.ini
+${PROG_NOINST}.nro: serialization.xml
+	rm -fr romfs
+	mkdir -p romfs
+	cp testfile.bin testfile.txt testfile.ini serialization.xml romfs
+	nacptool --create "ObjFW tests" "Jonathan Schleifer" \
+		"${PACKAGE_VERSION}" tests.nacp
+	elf2nro ${PROG_NOINST} $@ --nacp=tests.nacp --romfsdir=romfs
+	rm -fr romfs tests.nacp
 
 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}