diff --git a/Makefile b/Makefile
index 74fdbff..5e4b4b0 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,18 @@ CFILES = $(shell find src -name '*.c')
 HFILES = $(shell find src -name '*.h')
 OFILES = $(CFILES:.c=.o)
 
-.PHONY: all clean coverage
+.PHONY: all clean coverage coverage-report coverage-html
 
 all: mousefs$(EXT) mousefs_random_test$(EXT) example_client$(EXT) libmousefs.a
 
 coverage: mousefs_random_test_coverage$(EXT)
 
+coverage-report:
+	@./scripts/measure_coverage.sh 5
+
+coverage-html:
+	@./scripts/measure_coverage.sh 5 --html
+
 mousefs$(EXT): $(CFILES) $(HFILES)
 	gcc -o $@ $(CFILES) $(CFLAGS) $(LFLAGS) -Iinc -DBUILD_SERVER
 
diff --git a/generate_coverage_html.sh b/scripts/generate_coverage_html.sh
similarity index 100%
rename from generate_coverage_html.sh
rename to scripts/generate_coverage_html.sh
diff --git a/measure_coverage.sh b/scripts/measure_coverage.sh
similarity index 95%
rename from measure_coverage.sh
rename to scripts/measure_coverage.sh
index a10e1de..876ea3e 100755
--- a/measure_coverage.sh
+++ b/scripts/measure_coverage.sh
@@ -95,7 +95,9 @@ echo
 # Generate HTML report if requested
 if [ "$2" == "--html" ]; then
     echo -e "${YELLOW}Generating HTML coverage report...${NC}"
-    ./generate_coverage_html.sh
+    # Get the directory where this script is located
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    "$SCRIPT_DIR/generate_coverage_html.sh"
     echo -e "${GREEN}HTML report generated in coverage_report/index.html${NC}"
     echo "Open with: firefox coverage_report/index.html (or your preferred browser)"
     echo