diff --git a/contrib/for-tests/porter/pod.json b/contrib/for-tests/porter/pod.json
index 61cf0970060..1b21be5f8ec 100644
--- a/contrib/for-tests/porter/pod.json
+++ b/contrib/for-tests/porter/pod.json
@@ -8,7 +8,7 @@
     "containers": [
       {
         "name": "porter",
-        "image": "gcr.io/google_containers/porter:91d46193649807d1340b46797774d8b2",
+        "image": "gcr.io/google_containers/porter:59ad46ed2c56ba50fa7f1dc176c07c37",
         "env": [
           {
             "name": "SERVE_PORT_80",
diff --git a/contrib/for-tests/porter/porter b/contrib/for-tests/porter/porter
deleted file mode 100755
index 44d19c3e6b6..00000000000
Binary files a/contrib/for-tests/porter/porter and /dev/null differ
diff --git a/contrib/for-tests/porter/porter.go b/contrib/for-tests/porter/porter.go
index 1e5a3f35e35..f80704383ca 100644
--- a/contrib/for-tests/porter/porter.go
+++ b/contrib/for-tests/porter/porter.go
@@ -33,7 +33,10 @@ const prefix = "SERVE_PORT_"
 
 func main() {
 	for _, vk := range os.Environ() {
-		parts := strings.Split(vk, "=")
+		// Put everything before the first = sign in parts[0], and
+		// everything else in parts[1] (even if there are multiple =
+		// characters).
+		parts := strings.SplitN(vk, "=", 2)
 		key := parts[0]
 		value := parts[1]
 		if strings.HasPrefix(key, prefix) {