diff --git a/Makefile b/Makefile
index 524e5579c..4669d16c4 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ ifdef WIN32
 	cd $(INSTALL_DIR)/koreader && cp ../../$(WIN32_DIR)/*.dll .
 endif
 	@echo "[*] Install plugins"
+	@# TODO: link istead of cp?
 	$(RCP) plugins/* $(INSTALL_DIR)/koreader/plugins/
 	@echo "[*] Installresources"
 	$(RCP) -pL resources/fonts/* $(INSTALL_DIR)/koreader/fonts/
@@ -105,7 +106,7 @@ testfront: $(INSTALL_DIR)/koreader/.busted
 		--no-auto-insulate \
 		-o verbose_print --exclude-tags=notest
 
-test:
+test: $(INSTALL_DIR)/koreader/.busted
 	$(MAKE) -C $(KOR_BASE) test
 	$(MAKE) testfront
 
diff --git a/kodev b/kodev
index e39ac0387..e41264ed2 100755
--- a/kodev
+++ b/kodev
@@ -319,6 +319,8 @@ OPTIONS:
         exit 1
     fi
 
+    check_submodules
+    make
     setup_env
     make "${EMU_DIR}/.busted"
     pushd "${EMU_DIR}"