diff --git a/.gitignore b/.gitignore
index b1e73de644f0..7618f6a26508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,11 @@ ENV/
 env.bak/
 venv.bak/
 
+# Protect Java package folders from global Python virtualenv env/ blanket collisions
+!**/src/main/java/**/env/
+!**/src/test/java/**/env/
+!**/src/main/proto/**/env/
+!**/src/test/proto/**/env/
 
 # Unit test / coverage reports
 .coverage