diff --git a/runtime/tests/Makefile b/runtime/tests/Makefile
index f4c71dc..673e937 100644
--- a/runtime/tests/Makefile
+++ b/runtime/tests/Makefile
@@ -9,11 +9,8 @@ SLEDGE_RT_DIR=${SLEDGE_BASE_DIR}/runtime/
 SLEDGE_COMPILETIME_INC=${SLEDGE_RT_DIR}/include
 SLEDGE_COMPILETIME_SRC=${SLEDGE_RT_DIR}/compiletime/*.c
 
-ALL=fibonacci empty ekf cifar10 gocr lpd resize
-ALL_COPY_DEST=$(ALL:%=../../runtime/bin/%_wasm.so)
-
 .PHONY: all
-all: $(ALL_COPY_DEST)
+all: fibonacci.install empty.install ekf.install cifar10.install lpd.install resize.install
 
 .PHONY: clean
 clean:
@@ -23,36 +20,9 @@ clean:
 	@make clean -C ./CMSIS_5_NN/ -f Makefile
 	@make clean -C ./gocr/src/ -f wasm.mk
 	@make clean -C ./sod/
+	@rm -f *.wasm
 	@rm -f ../../runtime/bin/*.so
 
-fibonacci.wasm:
-	@make fibonacci.wasm -C ./fibonacci
-	@cp ./fibonacci/fibonacci.wasm fibonacci.wasm
-
-empty.wasm:
-	@make empty.wasm -C ./empty
-	@cp ./empty/empty.wasm empty.wasm
-
-ekf.wasm:
-	@make gps_ekf_fn.wasm -C ./TinyEKF/extras/c/ -f wasm.mk
-	@cp ./TinyEKF/extras/c/gps_ekf_fn.wasm ekf.wasm
-
-cifar10.wasm:
-	@make cifar10.wasm -C ./CMSIS_5_NN/ -f Makefile
-	@cp ./CMSIS_5_NN/cifar10.wasm cifar10.wasm
-
-gocr.wasm:
-	@make gocr.wasm -C ./gocr/src/ -f wasm.mk
-	@cp ./gocr/src/gocr.wasm gocr.wasm
-
-lpd.wasm:
-	@make dir license_plate_detection.wasm -C ./sod/
-	@cp ./sod/bin/license_plate_detection.wasm lpd.wasm
-
-resize.wasm:
-	@make dir resize_image.wasm -C ./sod/
-	@cp ./sod/bin/resize_image.wasm resize.wasm
-
 %.bc: %.wasm
 	${AWSMCC} --inline-constant-globals --runtime-globals $^ -o $@
 
@@ -62,23 +32,72 @@ resize.wasm:
 ../../runtime/bin/%.so: %.so
 	cp $^ $@
 
+# Fibonacci
+./fibonacci/fibonacci.wasm:
+	@make fibonacci.wasm -C ./fibonacci
+
+fibonacci.wasm: ./fibonacci/fibonacci.wasm
+	@cp ./fibonacci/fibonacci.wasm fibonacci.wasm
+
 .PHONY: fibonacci.install
 fibonacci.install: ../../runtime/bin/fibonacci_wasm.so
 
+# Empty
+./empty/empty.wasm:
+	@make empty.wasm -C ./empty
+
+empty.wasm: ./empty/empty.wasm
+	@cp ./empty/empty.wasm empty.wasm
+
 .PHONY: empty.install
 empty.install: ../../runtime/bin/empty_wasm.so
 
+# EKF
+./TinyEKF/extras/c/gps_ekf_fn.wasm:
+	@make gps_ekf_fn.wasm -C ./TinyEKF/extras/c/ -f wasm.mk
+
+ekf.wasm: ./TinyEKF/extras/c/gps_ekf_fn.wasm
+	@cp ./TinyEKF/extras/c/gps_ekf_fn.wasm ekf.wasm
+
 .PHONY: ekf.install
 ekf.install: ../../runtime/bin/ekf_wasm.so
 
+# CIFAR10
+./CMSIS_5_NN/cifar10.wasm:
+	@make cifar10.wasm -C ./CMSIS_5_NN/ -f Makefile
+
+cifar10.wasm: ./CMSIS_5_NN/cifar10.wasm
+	@cp ./CMSIS_5_NN/cifar10.wasm cifar10.wasm
+
 .PHONY: cifar10.install
 cifar10.install: ../../runtime/bin/cifar10_wasm.so
 
+# GOCR
+./gocr/src/gocr.wasm:
+	@make gocr.wasm -C ./gocr/src/ -f wasm.mk
+
+gocr.wasm: ./gocr/src/gocr.wasm
+	@cp ./gocr/src/gocr.wasm gocr.wasm
+
 .PHONY: gocr.install
 gocr.install: ../../runtime/bin/gocr_wasm.so
 
+# LPD
+./sod/bin/license_plate_detection.wasm:
+	@make dir license_plate_detection.wasm -C ./sod/
+
+lpd.wasm: ./sod/bin/license_plate_detection.wasm
+	@cp ./sod/bin/license_plate_detection.wasm lpd.wasm
+
 .PHONY: lpd.install
 lpd.install: ../../runtime/bin/lpd_wasm.so
 
+# Resize
+./sod/bin/resize_image.wasm:
+	@make dir resize_image.wasm -C ./sod/
+
+resize.wasm: ./sod/bin/resize_image.wasm
+	@cp ./sod/bin/resize_image.wasm resize.wasm
+
 .PHONY: resize.install
 resize.install: ../../runtime/bin/resize_wasm.so