diff --git a/Makefile b/Makefile
index bf03dcbf928495a49984e9e60ce38b912c4636e4..d1ea5092e1786ac8da257a9eab0c9ebec59387f3 100644
--- a/Makefile
+++ b/Makefile
@@ -145,7 +145,7 @@ release:
 
 coverage:
 	$(MAKE) clean
-	COVERAGEFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS+="-lgcov" $(MAKE) all check
+	COVERAGEFLAGS="-fprofile-arcs -ftest-coverage" LDFLAGS+="-lgcov" $(MAKE) all check -j32
 	(cd coverage; ./coverage_test.sh)
 	# Delete intermediate files
 	find . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm {} \;
diff --git a/coverage/coverage_test.sh b/coverage/coverage_test.sh
index 7a8b5e0fe4ff98966fb5e910072ad5c41df2e8fa..08dbd05a594b16fbc26b2350ab068364107d8f86 100755
--- a/coverage/coverage_test.sh
+++ b/coverage/coverage_test.sh
@@ -44,6 +44,11 @@ $GCOV --preserve-paths --relative-only --no-output $GCNO_FILES 2>/dev/null |
   tee -a $RECENT_REPORT &&
 echo -e "Generated coverage report for recently updated files: $RECENT_REPORT\n"
 
+# Unless otherwise specified, we'll not generate html report by default
+if [ -z "$HTML" ]; then
+  exit 0
+fi
+
 # Generate the html report. If we cannot find lcov in this machine, we'll simply
 # skip this step.
 echo "Generating the html coverage report..."