diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 00000000000..2924918018e
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,18 @@
+{
+  "preset": "node-style-guide",
+  "requireTrailingComma": null,
+  "requireCapitalizedComments": null,
+  "requireSpaceAfterKeywords": [
+    "if",
+    "else",
+    "for",
+    "while",
+    "do",
+    "switch",
+    "case",
+    "return",
+    "try",
+    "typeof"
+  ],
+  "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties"
+}
diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
index 57418778d12..a3538e4a16a 100644
--- a/lib/datastore/entity.js
+++ b/lib/datastore/entity.js
@@ -28,7 +28,7 @@ var OP_TO_OPERATOR = {
   '>=': 'GREATER_THAN_OR_EQUAL',
   '<':  'LESS_THAN',
   '<=': 'LESS_THAN_OR_EQUAL',
-  'HAS_ANCESTOR': 'HAS_ANCESTOR'
+  HAS_ANCESTOR: 'HAS_ANCESTOR'
 };
 
 /** @const {object} Conversion map for query sign -> order protocol value. */
@@ -221,7 +221,7 @@ function keyToKeyProto(key) {
   var path = [];
   for (var i = 0; i < keyPath.length; i += 2) {
     var p = { kind: keyPath[i] };
-    var val = keyPath[i+1];
+    var val = keyPath[i + 1];
     if (val) {
       // if not numeric, set key name.
       if (isNaN(val)) {
@@ -343,7 +343,7 @@ function propertyToValue(property) {
   if (exists(property.timestamp_microseconds_value)) {
     var microSecs = parseInt(
         property.timestamp_microseconds_value.toString(), 10);
-    return new Date(microSecs/1000);
+    return new Date(microSecs / 1000);
   }
   if (exists(property.key_value)) {
     return keyFromKeyProto(property.key_value);
diff --git a/lib/datastore/request.js b/lib/datastore/request.js
index 84d1d4e98a7..74de8c83e30 100644
--- a/lib/datastore/request.js
+++ b/lib/datastore/request.js
@@ -365,19 +365,23 @@ DatastoreRequest.prototype.save = function(entities, callback) {
 
       if (method) {
         switch (method) {
-          case 'insert':
+          case 'insert': {
             acc.insert.push(ent);
             break;
-          case 'update':
+          }
+          case 'update': {
             acc.update.push(ent);
             break;
-          case 'upsert':
+          }
+          case 'upsert': {
             acc.upsert.push(ent);
             break;
-          case 'insert_auto_id':
+          }
+          case 'insert_auto_id': {
             insertIndexes.push(index);
             acc.insert_auto_id.push(ent);
             break;
+          }
         }
       } else {
         if (entity.isKeyComplete(entityObject.key)) {
diff --git a/lib/index.js b/lib/index.js
index fbeab901aa3..0a03374ac49 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -225,7 +225,7 @@ gcloud.pubsub = function(config) {
  *   keyFilename: '/path/to/keyfile.json'
  * });
  */
-gcloud.search = function (config) {
+gcloud.search = function(config) {
   return new Search(config);
 };
 
diff --git a/lib/storage/file.js b/lib/storage/file.js
index 4ab4d472e41..8f9688d1489 100644
--- a/lib/storage/file.js
+++ b/lib/storage/file.js
@@ -1201,8 +1201,8 @@ File.prototype.setMetadata = function(metadata, callback) {
 File.prototype.makePrivate = function(options, callback) {
   var that = this;
   if (util.is(options, 'function')) {
-      callback = options;
-      options = {};
+    callback = options;
+    options = {};
   }
   var path = '/o/' + encodeURIComponent(this.name);
   var query = { predefinedAcl: options.strict ? 'private' : 'projectPrivate' };
diff --git a/package.json b/package.json
index b78ae3dce45..e1088d4c5fd 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "dox": "^0.7.0",
     "glob": "^5.0.9",
     "istanbul": "^0.3.5",
+    "jscs": "^1.13.1",
     "jshint": "^2.6.0",
     "mitm": "^1.1.0",
     "mocha": "^2.1.0",
@@ -80,7 +81,7 @@
   },
   "scripts": {
     "docs": "./scripts/docs.sh",
-    "lint": "jshint lib/ system-test/ test/",
+    "lint": "jshint lib/ system-test/ test/ && jscs lib/ system-test/ test/",
     "test": "npm run docs && mocha test/*/*.js test/docs.js",
     "system-test": "mocha system-test/* --timeout 30000",
     "cover": "istanbul cover -x 'system-test/*' _mocha -- --timeout 30000 test/*/*.js test/docs.js system-test/*",
diff --git a/system-test/datastore.js b/system-test/datastore.js
index 1fff93925ee..6a0b3e54881 100644
--- a/system-test/datastore.js
+++ b/system-test/datastore.js
@@ -84,7 +84,7 @@ describe('datastore', function() {
         buf: new Buffer('010100000000000000000059400000000000006940', 'hex')
       };
 
-      ds.save({ key: postKey, data: data }, function (err) {
+      ds.save({ key: postKey, data: data }, function(err) {
         assert.ifError(err);
 
         var assignedId = postKey.path[1];
diff --git a/system-test/storage.js b/system-test/storage.js
index a44adb23a57..8cb90b5cad5 100644
--- a/system-test/storage.js
+++ b/system-test/storage.js
@@ -491,14 +491,14 @@ describe('storage', function() {
 
         var fileSize = file.metadata.size;
         var byteRange = {
-          start: Math.floor(fileSize * 1/3),
-          end: Math.floor(fileSize * 2/3)
+          start: Math.floor(fileSize * 1 / 3),
+          end: Math.floor(fileSize * 2 / 3)
         };
         var expectedContentSize = byteRange.start + 1;
 
         var sizeStreamed = 0;
         file.createReadStream(byteRange)
-          .on('data', function (chunk) {
+          .on('data', function(chunk) {
             sizeStreamed += chunk.length;
           })
           .on('error', done)
diff --git a/test/bigquery/index.js b/test/bigquery/index.js
index dbc1c0f4133..54962a81cc9 100644
--- a/test/bigquery/index.js
+++ b/test/bigquery/index.js
@@ -25,10 +25,10 @@ function FakeTable(a, b) {
   Table.call(this, a, b);
 }
 
-var mergeSchemaWithRows_Override;
+var mergeSchemaWithRowsOverride;
 FakeTable.mergeSchemaWithRows_ = function() {
   var args = [].slice.apply(arguments);
-  return (mergeSchemaWithRows_Override || Table.mergeSchemaWithRows_)
+  return (mergeSchemaWithRowsOverride || Table.mergeSchemaWithRows_)
     .apply(null, args);
 };
 
@@ -481,8 +481,8 @@ describe('BigQuery', function() {
       var rows = [{ row: 'a' }, { row: 'b' }, { row: 'c' }];
       var schema = [{ fields: [] }];
 
-      mergeSchemaWithRows_Override = function(s, r) {
-        mergeSchemaWithRows_Override = null;
+      mergeSchemaWithRowsOverride = function(s, r) {
+        mergeSchemaWithRowsOverride = null;
         assert.deepEqual(s, schema);
         assert.deepEqual(r, rows);
         done();
@@ -523,8 +523,8 @@ describe('BigQuery', function() {
         });
       };
 
-      mergeSchemaWithRows_Override = function() {
-        mergeSchemaWithRows_Override = null;
+      mergeSchemaWithRowsOverride = function() {
+        mergeSchemaWithRowsOverride = null;
         return ROWS;
       };
 
diff --git a/test/bigquery/table.js b/test/bigquery/table.js
index e225abc1d96..94b952479b9 100644
--- a/test/bigquery/table.js
+++ b/test/bigquery/table.js
@@ -30,11 +30,11 @@ function FakeFile(a, b) {
   File.call(this, a, b);
 }
 
-var makeWritableStream_Override;
+var makeWritableStreamOverride;
 var fakeUtil = extend({}, util, {
   makeWritableStream: function() {
     var args = [].slice.call(arguments);
-    (makeWritableStream_Override || util.makeWritableStream).apply(null, args);
+    (makeWritableStreamOverride || util.makeWritableStream).apply(null, args);
   }
 });
 
@@ -95,7 +95,7 @@ describe('BigQuery/Table', function() {
   });
 
   beforeEach(function() {
-    makeWritableStream_Override = null;
+    makeWritableStreamOverride = null;
     table = new Table(DATASET, TABLE_ID);
   });
 
@@ -271,7 +271,7 @@ describe('BigQuery/Table', function() {
     it('should use a string as the file type', function(done) {
       var fileType = 'csv';
 
-      makeWritableStream_Override = function(stream, options) {
+      makeWritableStreamOverride = function(stream, options) {
         var load = options.metadata.configuration.load;
         assert.equal(load.sourceFormat, 'CSV');
         done();
@@ -305,7 +305,7 @@ describe('BigQuery/Table', function() {
       it('should make a writable stream when written to', function(done) {
         var stream;
 
-        makeWritableStream_Override = function(s) {
+        makeWritableStreamOverride = function(s) {
           assert.equal(s, stream);
           done();
         };
@@ -315,7 +315,7 @@ describe('BigQuery/Table', function() {
       });
 
       it('should pass the connection', function(done) {
-        makeWritableStream_Override = function(stream, options) {
+        makeWritableStreamOverride = function(stream, options) {
           assert.deepEqual(options.connection, table.connection);
           done();
         };
@@ -324,7 +324,7 @@ describe('BigQuery/Table', function() {
       });
 
       it('should pass extended metadata', function(done) {
-        makeWritableStream_Override = function(stream, options) {
+        makeWritableStreamOverride = function(stream, options) {
           assert.deepEqual(options.metadata, {
             configuration: {
               load: {
@@ -345,7 +345,7 @@ describe('BigQuery/Table', function() {
       });
 
       it('should pass the correct request uri', function(done) {
-        makeWritableStream_Override = function(stream, options) {
+        makeWritableStreamOverride = function(stream, options) {
           var uri = 'https://www.googleapis.com/upload/bigquery/v2/projects/' +
             table.bigQuery.projectId + '/jobs';
           assert.equal(options.request.uri, uri);
@@ -363,7 +363,7 @@ describe('BigQuery/Table', function() {
           return { id: id };
         };
 
-        makeWritableStream_Override = function(stream, options, callback) {
+        makeWritableStreamOverride = function(stream, options, callback) {
           callback(metadata);
         };
 
diff --git a/test/common/stream-router.js b/test/common/stream-router.js
index deff15c8861..097780e64af 100644
--- a/test/common/stream-router.js
+++ b/test/common/stream-router.js
@@ -37,7 +37,7 @@ describe('streamRouter', function() {
       warnOnUnregistered: false
     });
     streamRouter = require('../../lib/common/stream-router.js');
-    var streamRouter_Cached = extend(true, {}, streamRouter);
+    var streamRouterCached = extend(true, {}, streamRouter);
 
     Object.keys(streamRouter).forEach(function(streamRouterMethod) {
       if (typeof streamRouter[streamRouterMethod] !== 'function') {
@@ -50,7 +50,7 @@ describe('streamRouter', function() {
         if (streamRouterOverrides[streamRouterMethod]) {
           return streamRouterOverrides[streamRouterMethod].apply(this, args);
         } else {
-          return streamRouter_Cached[streamRouterMethod].apply(this, args);
+          return streamRouterCached[streamRouterMethod].apply(this, args);
         }
       };
     });
diff --git a/test/common/util.js b/test/common/util.js
index ef1612fa55c..60f61d1e03d 100644
--- a/test/common/util.js
+++ b/test/common/util.js
@@ -28,16 +28,16 @@ var retryRequest = require('retry-request');
 var stream = require('stream');
 var streamForward = require('stream-forward');
 
-var googleAuthLibrary_Override;
+var googleAuthLibraryOverride;
 function fakeGoogleAuthLibrary() {
-  return (googleAuthLibrary_Override || googleAuthLibrary)
+  return (googleAuthLibraryOverride || googleAuthLibrary)
     .apply(null, arguments);
 }
 
 var REQUEST_DEFAULT_CONF;
-var request_Override;
+var requestOverride;
 function fakeRequest() {
-  return (request_Override || request).apply(null, arguments);
+  return (requestOverride || request).apply(null, arguments);
 }
 fakeRequest.defaults = function(defaultConfiguration) {
   // Ignore the default values, so we don't have to test for them in every API
@@ -46,14 +46,14 @@ fakeRequest.defaults = function(defaultConfiguration) {
   return fakeRequest;
 };
 
-var retryRequest_Override;
+var retryRequestOverride;
 function fakeRetryRequest() {
-  return (retryRequest_Override || retryRequest).apply(null, arguments);
+  return (retryRequestOverride || retryRequest).apply(null, arguments);
 }
 
-var streamForward_Override;
+var streamForwardOverride;
 function fakeStreamForward() {
-  return (streamForward_Override || streamForward).apply(null, arguments);
+  return (streamForwardOverride || streamForward).apply(null, arguments);
 }
 
 describe('common/util', function() {
@@ -70,7 +70,7 @@ describe('common/util', function() {
       warnOnUnregistered: false
     });
     util = require('../../lib/common/util');
-    var util_Cached = extend(true, {}, util);
+    var utilCached = extend(true, {}, util);
 
     // Override all util methods, allowing them to be mocked. Overrides are
     // removed before each test.
@@ -80,7 +80,7 @@ describe('common/util', function() {
       }
 
       util[utilMethod] = function() {
-        return (utilOverrides[utilMethod] || util_Cached[utilMethod])
+        return (utilOverrides[utilMethod] || utilCached[utilMethod])
           .apply(this, arguments);
       };
     });
@@ -92,10 +92,10 @@ describe('common/util', function() {
   });
 
   beforeEach(function() {
-    googleAuthLibrary_Override = null;
-    request_Override = null;
-    retryRequest_Override = null;
-    streamForward_Override = null;
+    googleAuthLibraryOverride = null;
+    requestOverride = null;
+    retryRequestOverride = null;
+    streamForwardOverride = null;
     utilOverrides = {};
   });
 
@@ -294,7 +294,7 @@ describe('common/util', function() {
       var boundary;
       var metadata = { a: 'b', c: 'd' };
 
-      request_Override = function() {
+      requestOverride = function() {
         var written = [];
 
         var req = duplexify();
@@ -342,7 +342,7 @@ describe('common/util', function() {
       var ws = new stream.Writable();
       ws.write = function() {};
 
-      request_Override = function() {
+      requestOverride = function() {
         return ws;
       };
 
@@ -363,7 +363,7 @@ describe('common/util', function() {
       var ws = new stream.Writable();
       ws.write = function() {};
 
-      request_Override = function() {
+      requestOverride = function() {
         return ws;
       };
 
@@ -384,7 +384,7 @@ describe('common/util', function() {
     it('should use google-auth-library', function() {
       var googleAuthLibraryCalled = false;
 
-      googleAuthLibrary_Override = function() {
+      googleAuthLibraryOverride = function() {
         googleAuthLibraryCalled = true;
         return {
           getApplicationDefault: util.noop
@@ -399,7 +399,7 @@ describe('common/util', function() {
     it('should create a JWT auth client from a keyFile', function(done) {
       var jwt = {};
 
-      googleAuthLibrary_Override = function() {
+      googleAuthLibraryOverride = function() {
         return {
           JWT: function() { return jwt; }
         };
@@ -427,7 +427,7 @@ describe('common/util', function() {
     it('should create an auth client from credentials', function(done) {
       var credentialsSet;
 
-      googleAuthLibrary_Override = function() {
+      googleAuthLibraryOverride = function() {
         return {
           fromJSON: function(credentials, callback) {
             credentialsSet = credentials;
@@ -447,7 +447,7 @@ describe('common/util', function() {
     });
 
     it('should create an auth client from magic', function(done) {
-      googleAuthLibrary_Override = function() {
+      googleAuthLibraryOverride = function() {
         return {
           getApplicationDefault: function(callback) {
             callback(null, {});
@@ -474,7 +474,7 @@ describe('common/util', function() {
         getAccessToken: function() {}
       };
 
-      googleAuthLibrary_Override = function() {
+      googleAuthLibraryOverride = function() {
         return {
           getApplicationDefault: function(callback) {
             callback(null, fakeAuthClient);
@@ -984,7 +984,7 @@ describe('common/util', function() {
     it('should decorate the request', function(done) {
       var reqOpts = { a: 'b', c: 'd' };
 
-      retryRequest_Override = util.noop;
+      retryRequestOverride = util.noop;
 
       utilOverrides.decorateRequest = function(reqOpts_) {
         assert.strictEqual(reqOpts_, reqOpts);
@@ -996,17 +996,17 @@ describe('common/util', function() {
 
     describe('stream mode', function() {
       it('should pass the default options to retryRequest', function(done) {
-        retryRequest_Override = testDefaultRetryRequestConfig(done);
+        retryRequestOverride = testDefaultRetryRequestConfig(done);
         util.makeRequest(reqOpts, {});
       });
 
       it('should allow turning off retries to retryRequest', function(done) {
-        retryRequest_Override = testNoRetryRequestConfig(done);
+        retryRequestOverride = testNoRetryRequestConfig(done);
         util.makeRequest(reqOpts, noRetryRequestConfig);
       });
 
       it('should override number of retries to retryRequest', function(done) {
-        retryRequest_Override = testCustomRetryRequestConfig(done);
+        retryRequestOverride = testCustomRetryRequestConfig(done);
         util.makeRequest(reqOpts, customRetryRequestConfig);
       });
 
@@ -1014,11 +1014,11 @@ describe('common/util', function() {
         var requestStream = new stream.Stream();
         var userStream = new stream.Stream();
 
-        retryRequest_Override = function() {
+        retryRequestOverride = function() {
           return requestStream;
         };
 
-        streamForward_Override = function(stream_) {
+        streamForwardOverride = function(stream_) {
           assert.strictEqual(stream_, requestStream);
           done();
           return stream_;
@@ -1030,17 +1030,17 @@ describe('common/util', function() {
 
     describe('callback mode', function() {
       it('should pass the default options to retryRequest', function(done) {
-        retryRequest_Override = testDefaultRetryRequestConfig(done);
+        retryRequestOverride = testDefaultRetryRequestConfig(done);
         util.makeRequest(reqOpts, {}, assert.ifError);
       });
 
       it('should allow turning off retries to retryRequest', function(done) {
-        retryRequest_Override = testNoRetryRequestConfig(done);
+        retryRequestOverride = testNoRetryRequestConfig(done);
         util.makeRequest(reqOpts, noRetryRequestConfig, assert.ifError);
       });
 
       it('should override number of retries to retryRequest', function(done) {
-        retryRequest_Override = testCustomRetryRequestConfig(done);
+        retryRequestOverride = testCustomRetryRequestConfig(done);
         util.makeRequest(reqOpts, customRetryRequestConfig, assert.ifError);
       });
 
@@ -1049,7 +1049,7 @@ describe('common/util', function() {
         var response = { a: 'b', c: 'd' };
         var body = response.a;
 
-        request_Override = function(rOpts, callback) {
+        requestOverride = function(rOpts, callback) {
           callback(error, response, body);
         };
 
diff --git a/test/datastore/dataset.js b/test/datastore/dataset.js
index e79e67bbad6..09e3f7f4e23 100644
--- a/test/datastore/dataset.js
+++ b/test/datastore/dataset.js
@@ -38,7 +38,7 @@ describe('Dataset', function() {
       var options = { a: 'b', c: 'd', projectId: 'project-id' };
       var mockApiEndpoint = 'http://localhost:8080';
 
-      Dataset.determineApiEndpoint_ = function (opts) {
+      Dataset.determineApiEndpoint_ = function(opts) {
         assert.deepEqual(opts, options);
         return mockApiEndpoint;
       };
diff --git a/test/datastore/entity.js b/test/datastore/entity.js
index 88fecfabd66..9a73825a595 100644
--- a/test/datastore/entity.js
+++ b/test/datastore/entity.js
@@ -24,58 +24,58 @@ var datastore = require('../../lib/datastore');
 var ByteBuffer = require('bytebuffer');
 
 var entityProto = {
-  'property': [{
-    'name': 'linkedTo',
-    'value': {
-        'key_value': {
-            'path_element': [{
-                'kind': 'Kind',
-                'name': '123'
-            }]
-        }
+  property: [{
+    name: 'linkedTo',
+    value: {
+      key_value: {
+        path_element: [{
+          kind: 'Kind',
+          name: '123'
+        }]
+      }
     }
   }, {
-      'name': 'name',
-      'value': {
-          'string_value': 'Some name'
-      }
+    name: 'name',
+    value: {
+      string_value: 'Some name'
+    }
   }, {
-      'name': 'flagged',
-      'value': {
-          'boolean_value': false
-      }
+    name: 'flagged',
+    value: {
+      boolean_value: false
+    }
   }, {
-      'name': 'count',
-      'value': {
-          'integer_value': 5
-      }
+    name: 'count',
+    value: {
+      integer_value: 5
+    }
   }, {
-      'name': 'total',
-      'value': {
-          'double_value': 7.8
-      }
+    name: 'total',
+    value: {
+      double_value: 7.8
+    }
   }, {
-      'name': 'author',
-      'value': {
-          'entity_value': {
-              'property': [{
-                  'name': 'name',
-                  'value': {
-                      'string_value': 'Burcu Dogan'
-                  }
-              }]
-          },
-          'indexed': false
-      }
+    name: 'author',
+    value: {
+      entity_value: {
+        property: [{
+          name: 'name',
+          value: {
+            string_value: 'Burcu Dogan'
+          }
+        }]
+      },
+      indexed: false
+    }
   }, {
-      'name': 'list',
-      'value': {
-          'list_value': [{
-              'integer_value': 6
-          }, {
-              'boolean_value': false
-          }]
-      }
+    name: 'list',
+    value: {
+      list_value: [{
+        integer_value: 6
+      }, {
+        boolean_value: false
+      }]
+    }
   }]
 };
 
@@ -147,7 +147,7 @@ describe('keyFromKeyProto', function() {
     assert.deepEqual(key, new entity.Key({ path: [ 'Kind', 'Name' ] }));
   });
 
-  it('should not inject null into path if no id set', function(){
+  it('should not inject null into path if no id set', function() {
     var key = entity.keyFromKeyProto(protoIncomplete);
     assert.deepEqual(key, new entity.Key({
       namespace: 'Test',
diff --git a/test/datastore/request.js b/test/datastore/request.js
index 6e384da3ed1..a52eae8e7ad 100644
--- a/test/datastore/request.js
+++ b/test/datastore/request.js
@@ -30,9 +30,9 @@ var stream = require('stream');
 var util = require('../../lib/common/util.js');
 
 var REQUEST_DEFAULT_CONF;
-var request_Override;
+var requestOverride;
 function fakeRequest() {
-  return (request_Override || requestModule).apply(null, arguments);
+  return (requestOverride || requestModule).apply(null, arguments);
 }
 fakeRequest.defaults = function(defaultConfiguration) {
   // Ignore the default values, so we don't have to test for them in every API
@@ -97,7 +97,7 @@ describe('Request', function() {
       namespace: 'namespace',
       path: ['Company', 123]
     });
-    request_Override = null;
+    requestOverride = null;
     request = new Request();
     request.apiEndpoint = CUSTOM_ENDPOINT;
     request.makeAuthorizedRequest_ = function(req, callback) {
@@ -471,7 +471,7 @@ describe('Request', function() {
         callback(null, mockResponse.withResults);
       };
 
-      request.runQuery(query, function (err, entities) {
+      request.runQuery(query, function(err, entities) {
         assert.ifError(err);
         assert.deepEqual(entities[0].key.path, ['Kind', 5732568548769792]);
 
@@ -487,7 +487,7 @@ describe('Request', function() {
         callback(null, mockResponse.withResults);
       };
 
-      request.runQuery(query, function (err, entities, nextQuery, apiResponse) {
+      request.runQuery(query, function(err, entities, nextQuery, apiResponse) {
         assert.ifError(err);
         assert.deepEqual(mockResponse.withResults, apiResponse);
         done();
@@ -634,7 +634,7 @@ describe('Request', function() {
 
     it('should make API request', function(done) {
       var mockRequest = { mock: 'request' };
-      request_Override = function(req) {
+      requestOverride = function(req) {
         assert.equal(req.headers['Content-Length'], 2);
         assert.deepEqual(req, mockRequest);
         done();
@@ -649,7 +649,7 @@ describe('Request', function() {
     it('should send protobuf request', function(done) {
       var requestOptions = { mode: 'NON_TRANSACTIONAL' };
       var decoded = new pb.CommitRequest(requestOptions).toBuffer();
-      request_Override = function() {
+      requestOverride = function() {
         var stream = { on: util.noop };
         stream.end = function(data) {
           assert.equal(String(data), String(decoded));
@@ -664,9 +664,9 @@ describe('Request', function() {
       pbFakeMethodResponseDecode = function() {
         done();
       };
-      request_Override = function() {
+      requestOverride = function() {
         var ws = new stream.Writable();
-        setImmediate(function () {
+        setImmediate(function() {
           ws.emit('response', ws);
           ws.emit('end');
         });
@@ -678,7 +678,7 @@ describe('Request', function() {
     it('should respect API host and port configuration', function(done) {
       request.apiEndpoint = CUSTOM_ENDPOINT;
 
-      request_Override = function(req) {
+      requestOverride = function(req) {
         assert.equal(req.uri.indexOf(CUSTOM_ENDPOINT), 0);
         done();
         return new stream.Writable();
@@ -701,7 +701,7 @@ describe('Request', function() {
           var expected = new pb.RollbackRequest({
             transaction: request.id
           }).toBuffer();
-          request_Override = function() {
+          requestOverride = function() {
             var stream = { on: util.noop, end: util.noop };
             stream.end = function(data) {
               assert.deepEqual(data, expected);
@@ -721,7 +721,7 @@ describe('Request', function() {
             mode: 'TRANSACTIONAL',
             transaction: request.id
           }).toBuffer();
-          request_Override = function() {
+          requestOverride = function() {
             var stream = { on: util.noop, end: util.noop };
             stream.end = function(data) {
               assert.deepEqual(data, expected);
@@ -736,7 +736,7 @@ describe('Request', function() {
           var expected = new pb.CommitRequest({
             mode: 'NON_TRANSACTIONAL'
           }).toBuffer();
-          request_Override = function() {
+          requestOverride = function() {
             var stream = { on: util.noop, end: util.noop };
             stream.end = function(data) {
               assert.deepEqual(data, expected);
@@ -757,7 +757,7 @@ describe('Request', function() {
               transaction: request.id
             }
           }).toBuffer();
-          request_Override = function() {
+          requestOverride = function() {
             var stream = { on: util.noop, end: util.noop };
             stream.end = function(data) {
               assert.deepEqual(data, expected);
@@ -770,7 +770,7 @@ describe('Request', function() {
 
         it('should not attach transactional properties', function(done) {
           var expected = new pb.LookupRequest().toBuffer();
-          request_Override = function() {
+          requestOverride = function() {
             var ws = new stream.Writable();
             ws.end = function(data) {
               assert.deepEqual(data, expected);
diff --git a/test/datastore/transaction.js b/test/datastore/transaction.js
index 72e26e9df14..17f5a5d2c2e 100644
--- a/test/datastore/transaction.js
+++ b/test/datastore/transaction.js
@@ -24,7 +24,7 @@ var extend = require('extend');
 var mockery = require('mockery');
 var util = require('../../lib/common/util.js');
 
-var DatastoreRequest_Override = {
+var DatastoreRequestOverride = {
   delete: util.noop,
   save: util.noop
 };
@@ -33,15 +33,15 @@ var FakeDatastoreRequest = {
   prototype: {
     delete: function() {
       var args = [].slice.apply(arguments);
-      var results = DatastoreRequest_Override.delete.apply(null, args);
-      DatastoreRequest_Override.delete = util.noop;
+      var results = DatastoreRequestOverride.delete.apply(null, args);
+      DatastoreRequestOverride.delete = util.noop;
       return results;
     },
 
     save: function() {
       var args = [].slice.apply(arguments);
-      var results = DatastoreRequest_Override.save.apply(null, args);
-      DatastoreRequest_Override.save = util.noop;
+      var results = DatastoreRequestOverride.save.apply(null, args);
+      DatastoreRequestOverride.save = util.noop;
       return results;
     }
   }
@@ -261,13 +261,13 @@ describe('Transaction', function() {
       var args = [];
 
       var deleteCalled = 0;
-      DatastoreRequest_Override.delete = function() {
+      DatastoreRequestOverride.delete = function() {
         args.push(arguments[0]);
         deleteCalled++;
       };
 
       var saveCalled = 0;
-      DatastoreRequest_Override.save = function() {
+      DatastoreRequestOverride.save = function() {
         args.push(arguments[0]);
         saveCalled++;
       };
@@ -292,12 +292,12 @@ describe('Transaction', function() {
       transaction.save({ key: key(['Product', 123]), data: '' });
 
       var deleteCalled = 0;
-      DatastoreRequest_Override.delete = function() {
+      DatastoreRequestOverride.delete = function() {
         deleteCalled++;
       };
 
       var saveCalled = 0;
-      DatastoreRequest_Override.save = function() {
+      DatastoreRequestOverride.save = function() {
         saveCalled++;
       };
 
@@ -356,7 +356,7 @@ describe('Transaction', function() {
 
       assert.equal(transaction.modifiedEntities_.length, keys.length);
 
-      transaction.modifiedEntities_.forEach(function (queuedEntity) {
+      transaction.modifiedEntities_.forEach(function(queuedEntity) {
         assert.equal(queuedEntity.method, 'delete');
         assert(keys.indexOf(queuedEntity.entity.key) > -1);
         assert.deepEqual(queuedEntity.args, [queuedEntity.entity.key]);
@@ -376,7 +376,7 @@ describe('Transaction', function() {
 
       assert.equal(transaction.modifiedEntities_.length, entities.length);
 
-      transaction.modifiedEntities_.forEach(function (queuedEntity) {
+      transaction.modifiedEntities_.forEach(function(queuedEntity) {
         assert.equal(queuedEntity.method, 'save');
 
         var match = entities.filter(function(ent) {
diff --git a/test/pubsub/index.js b/test/pubsub/index.js
index 1f0e94f5fea..68901156a35 100644
--- a/test/pubsub/index.js
+++ b/test/pubsub/index.js
@@ -30,10 +30,10 @@ function Subscription(a, b) {
   return new OverrideFn(a, b);
 }
 
-var request_Cached = request;
-var request_Override;
+var requestCached = request;
+var requestOverride;
 function fakeRequest() {
-  return (request_Override || request_Cached).apply(null, arguments);
+  return (requestOverride || requestCached).apply(null, arguments);
 }
 fakeRequest.defaults = function() {
   // Ignore the default values, so we don't have to test for them in every API
@@ -79,7 +79,7 @@ describe('PubSub', function() {
 
   beforeEach(function() {
     SubscriptionOverride = null;
-    request_Override = null;
+    requestOverride = null;
     pubsub = new PubSub({ projectId: PROJECT_ID });
     pubsub.makeReq_ = function(method, path, q, body, callback) {
       callback();
diff --git a/test/search/index-class.js b/test/search/index-class.js
index 4f9a5c5bbd0..8ab9e9d225c 100644
--- a/test/search/index-class.js
+++ b/test/search/index-class.js
@@ -218,8 +218,10 @@ describe('Index', function() {
 
       index.documentFromObject_ = function(documentObject) {
         assert(documentObjects.indexOf(documentObject) > -1);
-        return true; // Used in the test callback to assure the value returned
-                     // to the callback is what's returned from this method.
+
+        // Used in the test callback to assure the value returned
+        // to the callback is what's returned from this method.
+        return true;
       };
 
       index.makeReq_ = function(method, path, query, body, callback) {
@@ -230,7 +232,7 @@ describe('Index', function() {
         assert.ifError(err);
 
         assert.strictEqual(documents.length, documentObjects.length);
-        assert(documents.every(function (document) { return document; }));
+        assert(documents.every(function(document) { return document; }));
 
         assert.strictEqual(nextQuery, null);
         assert.deepEqual(apiResp, apiResponse);
@@ -321,8 +323,10 @@ describe('Index', function() {
 
       index.documentFromObject_ = function(documentObject) {
         assert(documentObjects.indexOf(documentObject) > -1);
-        return true; // Used in the test callback to assure the value returned
-                     // to the callback is what's returned from this method.
+
+        // Used in the test callback to assure the value returned
+        // to the callback is what's returned from this method.
+        return true;
       };
 
       index.makeReq_ = function(method, path, query, body, callback) {
@@ -333,7 +337,7 @@ describe('Index', function() {
         assert.ifError(err);
 
         assert.strictEqual(documents.length, documentObjects.length);
-        assert(documents.every(function (document) { return document; }));
+        assert(documents.every(function(document) { return document; }));
 
         assert.strictEqual(nextQuery, null);
         assert.deepEqual(apiResp, apiResponse);
diff --git a/test/search/index.js b/test/search/index.js
index dcb98fcbd8f..0790adfe16c 100644
--- a/test/search/index.js
+++ b/test/search/index.js
@@ -39,11 +39,11 @@ var fakeStreamRouter = {
   }
 };
 
-var makeAuthorizedRequestFactory_Override;
+var makeAuthorizedRequestFactoryOverride;
 var fakeUtil = extend({}, util, {
   makeAuthorizedRequestFactory: function() {
-    if (makeAuthorizedRequestFactory_Override) {
-      return makeAuthorizedRequestFactory_Override.apply(null, arguments);
+    if (makeAuthorizedRequestFactoryOverride) {
+      return makeAuthorizedRequestFactoryOverride.apply(null, arguments);
     } else {
       return util.makeAuthorizedRequestFactory.apply(null, arguments);
     }
@@ -74,7 +74,7 @@ describe('Search', function() {
   });
 
   beforeEach(function() {
-    makeAuthorizedRequestFactory_Override = null;
+    makeAuthorizedRequestFactoryOverride = null;
 
     search = new Search({
       projectId: PROJECT_ID
@@ -100,7 +100,7 @@ describe('Search', function() {
         keyFilename: 'keyFile'
       };
 
-      makeAuthorizedRequestFactory_Override = function(options_) {
+      makeAuthorizedRequestFactoryOverride = function(options_) {
         assert.deepEqual(options_, {
           credentials: options.credentials,
           email: options.email,
@@ -184,8 +184,10 @@ describe('Search', function() {
 
       search.index = function(indexId) {
         assert(indexIds.indexOf(indexId) > -1);
-        return true; // Used in the test callback to assure the value returned
-                     // to the callback is what's returned from this method.
+
+        // Used in the test callback to assure the value returned
+        // to the callback is what's returned from this method.
+        return true;
       };
 
       search.makeReq_ = function(method, path, query, body, callback) {
@@ -196,7 +198,7 @@ describe('Search', function() {
         assert.ifError(err);
 
         assert.strictEqual(indexes.length, indexObjects.length);
-        assert(indexes.every(function (index) { return index; }));
+        assert(indexes.every(function(index) { return index; }));
 
         assert.strictEqual(nextQuery, null);
         assert.deepEqual(apiResp, apiResponse);
diff --git a/test/storage/acl.js b/test/storage/acl.js
index e2e2ba160f9..7b19b60d287 100644
--- a/test/storage/acl.js
+++ b/test/storage/acl.js
@@ -60,7 +60,7 @@ describe('storage/acl', function() {
       var apiResponse = { entity: ENTITY, role: ROLE };
       var expectedAclObject = { entity: ENTITY, role: ROLE };
 
-      acl.makeAclObject_ = function (obj) {
+      acl.makeAclObject_ = function(obj) {
         assert.deepEqual(obj, apiResponse);
         return expectedAclObject;
       };
@@ -180,7 +180,7 @@ describe('storage/acl', function() {
           { entity: ENTITY, role: ROLE }
         ];
 
-        acl.makeAclObject_ = function (obj, index) {
+        acl.makeAclObject_ = function(obj, index) {
           return expectedAclObjects[index];
         };
 
@@ -226,7 +226,7 @@ describe('storage/acl', function() {
         var apiResponse = { entity: ENTITY, role: ROLE };
         var expectedAclObject = { entity: ENTITY, role: ROLE };
 
-        acl.makeAclObject_ = function () {
+        acl.makeAclObject_ = function() {
           return expectedAclObject;
         };
 
@@ -284,7 +284,7 @@ describe('storage/acl', function() {
       var apiResponse = { entity: ENTITY, role: ROLE };
       var expectedAclObject = { entity: ENTITY, role: ROLE };
 
-      acl.makeAclObject_ = function () {
+      acl.makeAclObject_ = function() {
         return expectedAclObject;
       };
 
@@ -416,7 +416,7 @@ describe('storage/AclRoleAccessorMethods', function() {
       var userName = 'email@example.com';
       var role = 'fakerole';
 
-      aclEntity.add = function (options, callback) {
+      aclEntity.add = function(options, callback) {
         assert.deepEqual(options, {
           entity: 'user-' + userName,
           role: role
@@ -425,7 +425,7 @@ describe('storage/AclRoleAccessorMethods', function() {
         callback();
       };
 
-      aclEntity.delete = function (options, callback) {
+      aclEntity.delete = function(options, callback) {
         assert.deepEqual(options, {
           entity: 'user-' + userName,
           role: role
diff --git a/test/storage/bucket.js b/test/storage/bucket.js
index 0fd9b341788..887b546b52a 100644
--- a/test/storage/bucket.js
+++ b/test/storage/bucket.js
@@ -45,10 +45,10 @@ function FakeFile(bucket, name) {
   };
 }
 
-var request_Cached = request;
-var request_Override;
+var requestCached = request;
+var requestOverride;
 function fakeRequest() {
-  return (request_Override || request_Cached).apply(null, arguments);
+  return (requestOverride || requestCached).apply(null, arguments);
 }
 fakeRequest.defaults = function() {
   // Ignore the default values, so we don't have to test for them in every API
@@ -56,11 +56,11 @@ fakeRequest.defaults = function() {
   return fakeRequest;
 };
 
-var eachLimit_Override;
+var eachLimitOverride;
 
 var fakeAsync = extend({}, async);
 fakeAsync.eachLimit = function() {
-  (eachLimit_Override || async.eachLimit).apply(null, arguments);
+  (eachLimitOverride || async.eachLimit).apply(null, arguments);
 };
 
 var extended = false;
@@ -105,8 +105,8 @@ describe('Bucket', function() {
   });
 
   beforeEach(function() {
-    request_Override = null;
-    eachLimit_Override = null;
+    requestOverride = null;
+    eachLimitOverride = null;
     bucket = new Bucket(options, BUCKET_NAME);
   });
 
@@ -372,7 +372,7 @@ describe('Bucket', function() {
     });
 
     it('should process 10 files at a time', function(done) {
-      eachLimit_Override = function(arr, limit) {
+      eachLimitOverride = function(arr, limit) {
         assert.equal(limit, 10);
         done();
       };
@@ -1004,7 +1004,7 @@ describe('Bucket', function() {
     });
 
     it('should process 10 files at a time', function(done) {
-      eachLimit_Override = function(arr, limit) {
+      eachLimitOverride = function(arr, limit) {
         assert.equal(limit, 10);
         done();
       };
diff --git a/test/storage/file.js b/test/storage/file.js
index fb3a7cfabf5..16e55207459 100644
--- a/test/storage/file.js
+++ b/test/storage/file.js
@@ -50,24 +50,24 @@ function FakeDuplexify() {
 }
 nodeutil.inherits(FakeDuplexify, stream.Duplex);
 
-var makeWritableStream_Override;
-var handleResp_Override;
+var makeWritableStreamOverride;
+var handleRespOverride;
 var fakeUtil = extend({}, util, {
   handleResp: function() {
-    (handleResp_Override || util.handleResp).apply(null, arguments);
+    (handleRespOverride || util.handleResp).apply(null, arguments);
   },
 
   makeWritableStream: function() {
     var args = arguments;
-    (makeWritableStream_Override || util.makeWritableStream).apply(null, args);
+    (makeWritableStreamOverride || util.makeWritableStream).apply(null, args);
   }
 });
 
 var REQUEST_DEFAULT_CONF;
-var request_Cached = request;
-var request_Override;
+var requestCached = request;
+var requestOverride;
 function fakeRequest() {
-  return (request_Override || request_Cached).apply(null, arguments);
+  return (requestOverride || requestCached).apply(null, arguments);
 }
 fakeRequest.defaults = function(defaultConfiguration) {
   // Ignore the default values, so we don't have to test for them in every API
@@ -122,7 +122,7 @@ describe('File', function() {
         if (callback) {
           (callback.onAuthorized || callback)(null, req);
         } else {
-          return (request_Override || request_Cached)(req);
+          return (requestOverride || requestCached)(req);
         }
       }
     };
@@ -134,9 +134,9 @@ describe('File', function() {
     directoryFile = new File(bucket, 'directory/file.jpg');
     directoryFile.makeReq_ = util.noop;
 
-    handleResp_Override = null;
-    makeWritableStream_Override = null;
-    request_Override = null;
+    handleRespOverride = null;
+    makeWritableStreamOverride = null;
+    requestOverride = null;
   });
 
   it('should have set correct defaults on Request', function() {
@@ -477,13 +477,13 @@ describe('File', function() {
     });
 
     it('should end request stream on error', function(done) {
-      request_Override = getFakeSuccessfulRequest('body', { body: null });
+      requestOverride = getFakeSuccessfulRequest('body', { body: null });
 
       var readStream = file.createReadStream();
 
       readStream.once('error', function() {
-        assert(request_Override.wasRequestAborted());
-        assert(request_Override.wasRequestDestroyed());
+        assert(requestOverride.wasRequestAborted());
+        assert(requestOverride.wasRequestDestroyed());
         done();
       });
 
@@ -514,7 +514,7 @@ describe('File', function() {
 
         beforeEach(function() {
           file.bucket.storage.makeAuthorizedRequest_ = function(opts) {
-            var stream = (request_Override || request)(opts);
+            var stream = (requestOverride || request)(opts);
 
             setImmediate(function() {
               stream.emit('error', ERROR);
@@ -544,15 +544,15 @@ describe('File', function() {
       it('should get readable stream from request', function(done) {
         var fakeRequest = { a: 'b', c: 'd' };
 
-        request_Override = getFakeRequest();
+        requestOverride = getFakeRequest();
 
         file.bucket.storage.makeAuthorizedRequest_ = function() {
           setImmediate(function() {
-            assert.deepEqual(request_Override.getRequestOptions(), fakeRequest);
+            assert.deepEqual(requestOverride.getRequestOptions(), fakeRequest);
             done();
           });
 
-          return request_Override(fakeRequest);
+          return requestOverride(fakeRequest);
         };
 
         file.createReadStream();
@@ -562,7 +562,7 @@ describe('File', function() {
         var response = {
           headers: { 'x-goog-hash': 'md5=fakefakefake' }
         };
-        request_Override = getFakeSuccessfulRequest('body', response);
+        requestOverride = getFakeSuccessfulRequest('body', response);
 
         file.createReadStream({ validation: false })
           .on('response', function(res) {
@@ -575,7 +575,7 @@ describe('File', function() {
         var ERROR = new Error('Error.');
 
         beforeEach(function() {
-          request_Override = getFakeFailedRequest(ERROR);
+          requestOverride = getFakeFailedRequest(ERROR);
         });
 
         it('should emit the error', function(done) {
@@ -618,23 +618,23 @@ describe('File', function() {
           if (callback) {
             (callback.onAuthorized || callback)(null, {});
           } else {
-            return (request_Override || request_Cached)(opts);
+            return (requestOverride || requestCached)(opts);
           }
         };
       });
 
       it('should validate with crc32c', function(done) {
-        request_Override = getFakeSuccessfulRequest(data, fakeResponse.crc32c);
+        requestOverride = getFakeSuccessfulRequest(data, fakeResponse.crc32c);
 
         file.createReadStream({ validation: 'crc32c' })
           .on('error', done)
-          .on('complete', function () {
+          .on('complete', function() {
             done();
           });
       });
 
       it('should emit an error if crc32c validation fails', function(done) {
-        request_Override = getFakeSuccessfulRequest(
+        requestOverride = getFakeSuccessfulRequest(
             'bad-data', fakeResponse.crc32c);
 
         file.createReadStream({ validation: 'crc32c' })
@@ -645,17 +645,17 @@ describe('File', function() {
       });
 
       it('should validate with md5', function(done) {
-        request_Override = getFakeSuccessfulRequest(data, fakeResponse.md5);
+        requestOverride = getFakeSuccessfulRequest(data, fakeResponse.md5);
 
         file.createReadStream({ validation: 'md5' })
           .on('error', done)
-          .on('complete', function () {
+          .on('complete', function() {
             done();
           });
       });
 
       it('should emit an error if md5 validation fails', function(done) {
-        request_Override = getFakeSuccessfulRequest(
+        requestOverride = getFakeSuccessfulRequest(
             'bad-data', fakeResponse.crc32c);
 
         file.createReadStream({ validation: 'md5' })
@@ -666,7 +666,7 @@ describe('File', function() {
       });
 
       it('should default to md5 validation', function(done) {
-        request_Override = getFakeSuccessfulRequest(data, {
+        requestOverride = getFakeSuccessfulRequest(data, {
           headers: { 'x-goog-hash': 'md5=fakefakefake' }
         });
 
@@ -679,7 +679,7 @@ describe('File', function() {
 
       describe('destroying the through stream', function() {
         it('should destroy after failed validation', function(done) {
-          request_Override = getFakeSuccessfulRequest(
+          requestOverride = getFakeSuccessfulRequest(
               'bad-data', fakeResponse.crc32c);
 
           var readStream = file.createReadStream({ validation: 'md5' });
@@ -687,7 +687,7 @@ describe('File', function() {
         });
 
         it('should destroy after successful validation', function(done) {
-          request_Override = getFakeSuccessfulRequest(
+          requestOverride = getFakeSuccessfulRequest(
               data, fakeResponse.crc32c);
 
           var readStream = file.createReadStream({ validation: 'crc32c' });
@@ -700,8 +700,8 @@ describe('File', function() {
       it('should accept a start range', function(done) {
         var startOffset = 100;
 
-        request_Override = function(opts) {
-          setImmediate(function () {
+        requestOverride = function(opts) {
+          setImmediate(function() {
             assert.equal(opts.headers.Range, 'bytes=' + startOffset + '-');
             done();
           });
@@ -714,8 +714,8 @@ describe('File', function() {
       it('should accept an end range and set start to 0', function(done) {
         var endOffset = 100;
 
-        request_Override = function(opts) {
-          setImmediate(function () {
+        requestOverride = function(opts) {
+          setImmediate(function() {
             assert.equal(opts.headers.Range, 'bytes=0-' + endOffset);
             done();
           });
@@ -729,8 +729,8 @@ describe('File', function() {
         var startOffset = 100;
         var endOffset = 101;
 
-        request_Override = function(opts) {
-          setImmediate(function () {
+        requestOverride = function(opts) {
+          setImmediate(function() {
             var expectedRange = 'bytes=' + startOffset + '-' + endOffset;
             assert.equal(opts.headers.Range, expectedRange);
             done();
@@ -745,8 +745,8 @@ describe('File', function() {
         var startOffset = 0;
         var endOffset = 0;
 
-        request_Override = function(opts) {
-          setImmediate(function () {
+        requestOverride = function(opts) {
+          setImmediate(function() {
             var expectedRange = 'bytes=0-0';
             assert.equal(opts.headers.Range, expectedRange);
             done();
@@ -758,7 +758,7 @@ describe('File', function() {
       });
 
       it('should destroy the through stream', function(done) {
-        request_Override = getFakeSuccessfulRequest('body', { body: null });
+        requestOverride = getFakeSuccessfulRequest('body', { body: null });
 
         var readStream = file.createReadStream({ start: 100 });
         readStream.destroy = done;
@@ -769,8 +769,8 @@ describe('File', function() {
       it('should make a request for the tail bytes', function(done) {
         var endOffset = -10;
 
-        request_Override = function(opts) {
-          setImmediate(function () {
+        requestOverride = function(opts) {
+          setImmediate(function() {
             assert.equal(opts.headers.Range, 'bytes=' + endOffset);
             done();
           });
@@ -825,7 +825,7 @@ describe('File', function() {
       };
 
       // respond to first upload PUT request.
-      request_Override = function() {
+      requestOverride = function() {
         var stream = through();
         setImmediate(function() {
           stream.emit('error', error);
@@ -1330,9 +1330,9 @@ describe('File', function() {
       file.getSignedPolicy({
         expiration: Math.round(Date.now() / 1000) + 5
       }, function(err, signedPolicy) {
-          var conditionString = '[\"eq\",\"$key\",\"'+file.name+'\"]';
-          assert.ifError(err);
-          assert(signedPolicy.string.indexOf(conditionString) > -1);
+        var conditionString = '[\"eq\",\"$key\",\"' + file.name + '\"]';
+        assert.ifError(err);
+        assert(signedPolicy.string.indexOf(conditionString) > -1);
         done();
       });
     });
@@ -1342,9 +1342,9 @@ describe('File', function() {
         expiration: Math.round(Date.now() / 1000) + 5,
         acl: '<acl>'
       }, function(err, signedPolicy) {
-          var conditionString = '{\"acl\":\"<acl>\"}';
-          assert.ifError(err);
-          assert(signedPolicy.string.indexOf(conditionString) > -1);
+        var conditionString = '{\"acl\":\"<acl>\"}';
+        assert.ifError(err);
+        assert(signedPolicy.string.indexOf(conditionString) > -1);
         done();
       });
     });
@@ -1794,7 +1794,7 @@ describe('File', function() {
 
         // respond to first upload PUT request.
         var metadata = { a: 'b', c: 'd' };
-        request_Override = function(reqOpts) {
+        requestOverride = function(reqOpts) {
           assert.equal(reqOpts.headers['Content-Range'], 'bytes 0-*/*');
 
           var stream = through();
@@ -1861,7 +1861,7 @@ describe('File', function() {
         };
 
         var metadata = { a: 'b', c: 'd' };
-        request_Override = function(reqOpts) {
+        requestOverride = function(reqOpts) {
           var startByte = lastByte + 1;
           assert.equal(
             reqOpts.headers['Content-Range'], 'bytes ' + startByte + '-*/*');
@@ -1894,7 +1894,7 @@ describe('File', function() {
 
   describe('startSimpleUpload_', function() {
     it('should get a writable stream', function(done) {
-      makeWritableStream_Override = function() {
+      makeWritableStreamOverride = function() {
         done();
       };
 
@@ -1904,7 +1904,7 @@ describe('File', function() {
     it('should pass the required arguments', function(done) {
       var metadata = { a: 'b', c: 'd' };
 
-      makeWritableStream_Override = function(stream, options) {
+      makeWritableStreamOverride = function(stream, options) {
         assert.deepEqual(options.metadata, metadata);
         assert.deepEqual(options.request, {
           qs: {
@@ -1922,7 +1922,7 @@ describe('File', function() {
     it('should send query.ifGenerationMatch if File has one', function(done) {
       var versionedFile = new File(bucket, 'new-file.txt', { generation: 1 });
 
-      makeWritableStream_Override = function(stream, options) {
+      makeWritableStreamOverride = function(stream, options) {
         assert.equal(options.request.qs.ifGenerationMatch, 1);
         done();
       };
@@ -1933,7 +1933,7 @@ describe('File', function() {
     it('should finish stream and set metadata', function(done) {
       var metadata = { a: 'b', c: 'd' };
 
-      makeWritableStream_Override = function(stream, options, callback) {
+      makeWritableStreamOverride = function(stream, options, callback) {
         callback(metadata);
       };