diff --git a/Makefile b/Makefile
index 9ad4f3c6..c68db783 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ ifeq ($(TARGET),library)
 endif
 
 ifeq ($(TARGET),sim)
-	MAIN_TARGET:=wolfboot.elf test-app/image_v1_signed.bin internal_flash.dd
+	MAIN_TARGET:=wolfboot.elf tools/bin-assemble/bin-assemble test-app/image_v1_signed.bin internal_flash.dd
 endif
 
 ASFLAGS:=$(CFLAGS)
diff --git a/test-app/Makefile b/test-app/Makefile
index a63ab848..12571eb0 100644
--- a/test-app/Makefile
+++ b/test-app/Makefile
@@ -237,6 +237,8 @@ ifeq ($(TARGET),psoc6)
   CFLAGS+=-DCY8C624ABZI_D44
 endif
 
+CFLAGS+=-I../lib/wolfssl
+
 standalone:CFLAGS+=-D"TEST_APP_STANDALONE"
 standalone:LDFLAGS:=-T standalone.ld -Wl,-gc-sections -Wl,-Map=image.map