diff --git a/.github/kokoro/db-full.sh b/.github/kokoro/db-full.sh
index 2a670fd7..31c097b4 100755
--- a/.github/kokoro/db-full.sh
+++ b/.github/kokoro/db-full.sh
@@ -176,5 +176,6 @@ echo "----------------------------------------"
 	echo
 	echo "Cleaning up so CI doesn't save all the excess data."
 	make clean_fuzzers
+	make clean_piplists
 )
 echo "----------------------------------------"
diff --git a/fuzzers/050-pip-seed/Makefile b/fuzzers/050-pip-seed/Makefile
index 2dc96edd..a40ea42e 100644
--- a/fuzzers/050-pip-seed/Makefile
+++ b/fuzzers/050-pip-seed/Makefile
@@ -3,7 +3,7 @@ ifeq ($(QUICK),Y)
 N ?= 1
 SEGMATCH_FLAGS=
 else
-N ?= 48
+N ?= 60
 # Do relatively large batch to keep parallelism high
 # LCM between 12 (CPUs on my system) and 16, a common CPU count
 SEGMATCH_FLAGS=-m 15 -M 45
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index 9f5d8d47..b4d5401a 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -11,11 +11,14 @@ FUZZONLY=N
 BITONLY=N
 
 all:
-clean: clean_fuzzers clean_logs clean_locks
+clean: clean_fuzzers clean_piplists clean_logs clean_locks
 
 clean_locks:
 	rm -rf /tmp/segbits_*.db.lock
 
+clean_piplists:
+	rm -rf $(XRAY_FUZZERS_DIR)/piplist/build
+
 define fuzzer
 
 # $(1) - Fuzzer name/directory