diff --git a/spec/ParseGlobalConfig.spec.js b/spec/ParseGlobalConfig.spec.js
index 78364c6a..0257fe9c 100644
--- a/spec/ParseGlobalConfig.spec.js
+++ b/spec/ParseGlobalConfig.spec.js
@@ -28,7 +28,7 @@ describe('a GlobalConfig', () => {
   });
 
   it('can be updated when a master key exists', (done) => {
-    request.post({
+    request.put({
       url: 'http://localhost:8378/1/config',
       json: true,
       body: { params: { companies: ['US', 'DK', 'SE'] } },
@@ -38,13 +38,13 @@ describe('a GlobalConfig', () => {
       },
     }, (error, response, body) => {
       expect(response.statusCode).toEqual(200);
-      expect(body.params.companies).toEqual(['US', 'DK', 'SE']);
+      expect(body.result).toEqual(true);
       done();
     });
   });
 
   it('fail to update if master key is missing', (done) => {
-    request.post({
+    request.put({
       url: 'http://localhost:8378/1/config',
       json: true,
       body: { params: { companies: [] } },
@@ -78,24 +78,4 @@ describe('a GlobalConfig', () => {
       });
   });
 
-  it('failed updating config when it is missing', (done) => {
-    database.rawCollection('_GlobalConfig')
-      .then(coll => coll.deleteOne({ '_id': 1}, {}, {}))
-      .then(_ => {
-        request.post({
-          url: 'http://localhost:8378/1/config',
-          json: true,
-          body: { params: { companies: ['US', 'DK', 'SE'] } },
-          headers: {
-            'X-Parse-Application-Id': 'test',
-            'X-Parse-Master-Key': 'test'
-          },
-        }, (error, response, body) => {
-          expect(response.statusCode).toEqual(404);
-          expect(body.code).toEqual(Parse.Error.INVALID_KEY_NAME);
-          done();
-        });
-      });
-  });
-
 });
diff --git a/src/global_config.js b/src/global_config.js
index 30314f7a..3dd1b543 100644
--- a/src/global_config.js
+++ b/src/global_config.js
@@ -27,7 +27,7 @@ function updateGlobalConfig(req) {
   }
 
   return req.config.database.rawCollection('_GlobalConfig')
-    .then(coll => coll.findOneAndUpdate({ _id: 1 }, { $set: req.body }, { returnOriginal: false }))
+    .then(coll => coll.findOneAndUpdate({ _id: 1 }, { $set: req.body }))
     .then(response => {
       return { response: { result: true } }
     })
diff --git a/src/index.js b/src/index.js
index ade8527b..ef29ec7f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -121,7 +121,7 @@ function ParseServer(args) {
   router.merge(require('./installations'));
   router.merge(require('./functions'));
   router.merge(require('./schemas'));
-  if (process.env.PARSE_EXPERIMENTAL_CONFIG_ENABLED) {
+  if (process.env.PARSE_EXPERIMENTAL_CONFIG_ENABLED || process.env.TESTING) {
     router.merge(require('./global_config'));
   }