Merge "Fix zip tests"
diff --git a/third_party/zip/zip_test.go b/third_party/zip/zip_test.go
index 3a3c915..7373660 100644
--- a/third_party/zip/zip_test.go
+++ b/third_party/zip/zip_test.go
@@ -10,7 +10,6 @@
 	"bytes"
 	"fmt"
 	"hash"
-	"internal/testenv"
 	"io"
 	"io/ioutil"
 	"sort"
@@ -20,7 +19,7 @@
 )
 
 func TestOver65kFiles(t *testing.T) {
-	if testing.Short() && testenv.Builder() == "" {
+	if testing.Short() {
 		t.Skip("skipping in short mode")
 	}
 	buf := new(bytes.Buffer)