diff --git a/examples/limitrange/valid-pod.json b/examples/limitrange/valid-pod.json
index 01a79159d9b..8e3d50e6a47 100644
--- a/examples/limitrange/valid-pod.json
+++ b/examples/limitrange/valid-pod.json
@@ -13,8 +13,8 @@
         "name": "kubernetes-serve-hostname",
         "image": "kubernetes/serve_hostname",        
         "cpu": 1000,
-        "memory": 1048576,
+        "memory": 1048576
       }]
     }
-  },
+  }
 }
diff --git a/test/integration/auth_test.go b/test/integration/auth_test.go
index 916cb7be784..93a6bc8f489 100644
--- a/test/integration/auth_test.go
+++ b/test/integration/auth_test.go
@@ -73,7 +73,7 @@ var aPod string = `
     "manifest": {
       "version": "v1beta1",
       "id": "a",
-      "containers": [{ "name": "foo", "image": "bar/foo", }]
+      "containers": [{ "name": "foo", "image": "bar/foo" }]
     }
   }%s
 }
@@ -87,7 +87,7 @@ var aPodInBar string = `
     "manifest": {
       "version": "v1beta1",
       "id": "a",
-      "containers": [{ "name": "foo", "image": "bar/foo", }]
+      "containers": [{ "name": "foo", "image": "bar/foo" }]
     }
   }%s
 }
@@ -102,17 +102,18 @@ var aRC string = `
     "replicaSelector": {"name": "a"},
     "podTemplate": {
       "desiredState": {
-         "manifest": {
-           "version": "v1beta1",
-           "id": "a",
-           "containers": [{
-             "name": "foo",
-             "image": "bar/foo",
-           }]
-         }
-       },
-       "labels": {"name": "a"}
-      }},
+        "manifest": {
+          "version": "v1beta1",
+          "id": "a",
+          "containers": [{
+            "name": "foo",
+            "image": "bar/foo"
+          }]
+        }
+      },
+      "labels": {"name": "a"}
+    }
+  },
   "labels": {"name": "a"}%s
 }
 `
@@ -145,7 +146,7 @@ var aEvent string = `
     "kind": "Minion",
     "name": "a",
     "namespace": "default",
-    "apiVersion": "v1beta1",
+    "apiVersion": "v1beta1"
   }%s
 }
 `
@@ -343,10 +344,11 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
 					sub += fmt.Sprintf(",\r\n\"resourceVersion\": %v", resVersion)
 				}
 				namespace := "default"
-				sub += fmt.Sprintf(",\r\n\"namespace\": %v", namespace)
+				sub += fmt.Sprintf(",\r\n\"namespace\": %q", namespace)
 			}
 			bodyStr = fmt.Sprintf(r.body, sub)
 		}
+		r.body = bodyStr
 		bodyBytes := bytes.NewReader([]byte(bodyStr))
 		req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
 		if err != nil {
@@ -514,10 +516,11 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
 					sub += fmt.Sprintf(",\r\n\"resourceVersion\": %v", resVersion)
 				}
 				namespace := "default"
-				sub += fmt.Sprintf(",\r\n\"namespace\": %v", namespace)
+				sub += fmt.Sprintf(",\r\n\"namespace\": %q", namespace)
 			}
 			bodyStr = fmt.Sprintf(r.body, sub)
 		}
+		r.body = bodyStr
 		bodyBytes := bytes.NewReader([]byte(bodyStr))
 		req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
 		if err != nil {
@@ -767,10 +770,11 @@ func TestNamespaceAuthorization(t *testing.T) {
 				if len(namespace) == 0 {
 					namespace = "default"
 				}
-				sub += fmt.Sprintf(",\r\n\"namespace\": %v", namespace)
+				sub += fmt.Sprintf(",\r\n\"namespace\": %q", namespace)
 			}
 			bodyStr = fmt.Sprintf(r.body, sub)
 		}
+		r.body = bodyStr
 		bodyBytes := bytes.NewReader([]byte(bodyStr))
 		req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
 		if err != nil {
@@ -873,6 +877,7 @@ func TestKindAuthorization(t *testing.T) {
 				}
 			}
 		}
+		r.body = bodyStr
 		bodyBytes := bytes.NewReader([]byte(bodyStr))
 		req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
 		if err != nil {