diff --git a/mockgcp/Makefile b/mockgcp/Makefile
index c646f9c9ee4..a11fcdafbc4 100644
--- a/mockgcp/Makefile
+++ b/mockgcp/Makefile
@@ -96,7 +96,8 @@ gen-proto-no-fixup:
 		./third_party/googleapis/mockgcp/cloud/gkehub/v1beta/metering/*.proto \
 		./third_party/googleapis/mockgcp/cloud/gkehub/v1beta/multiclusteringress/*.proto \
 		./third_party/googleapis/mockgcp/cloud/gkehub/v1beta1/membership.proto \
-		./third_party/googleapis/mockgrafeas/v1/*.proto
+		./third_party/googleapis/mockgrafeas/v1/*.proto \
+		./third_party/googleapis/mockgcp/firestore/v1/*.proto
 		
 
 .PHONY: generate-grpc-for-google-protos
diff --git a/mockgcp/fixup-third-party.sh b/mockgcp/fixup-third-party.sh
index 69f4fce6942..60112273ec2 100755
--- a/mockgcp/fixup-third-party.sh
+++ b/mockgcp/fixup-third-party.sh
@@ -31,6 +31,7 @@ mv google/pubsub/ mockgcp/
 mv google/spanner/ mockgcp/
 mv google/storage/ mockgcp/
 mv google/monitoring/ mockgcp/
+mv google/firestore/ mockgcp/
 
 mv google/api/apikeys/ mockgcp/api/
 mv google/api/serviceusage/ mockgcp/api/
@@ -55,6 +56,9 @@ find . -type f -print0 | xargs -0 sed -i -e "s@google\.iam@mockgcp.iam@g"
 find . -type f -print0 | xargs -0 sed -i -e "s@google/logging/@mockgcp/logging/@g"
 find . -type f -print0 | xargs -0 sed -i -e "s@google\.logging@mockgcp.logging@g"
 
+find . -type f -print0 | xargs -0 sed -i -e "s@google/firestore/@mockgcp/firestore/@g"
+find . -type f -print0 | xargs -0 sed -i -e "s@google\.firestore@mockgcp.firestore@g"
+
 find . -type f -print0 | xargs -0 sed -i -e "s@google/pubsub/@mockgcp/pubsub/@g"
 find . -type f -print0 | xargs -0 sed -i -e "s@google\.pubsub@mockgcp.pubsub@g"