diff --git a/appengine/parse-server/package.json b/appengine/parse-server/package.json
index bae70e3dfa..1f06c56e7f 100644
--- a/appengine/parse-server/package.json
+++ b/appengine/parse-server/package.json
@@ -15,6 +15,6 @@
   },
   "dependencies": {
     "express": "^4.13.4",
-    "parse-server": "^2.0.6"
+    "parse-server": "^2.1.3"
   }
 }
diff --git a/appengine/parse-server/server.js b/appengine/parse-server/server.js
index 980dd62d58..ec3fa9366e 100644
--- a/appengine/parse-server/server.js
+++ b/appengine/parse-server/server.js
@@ -25,7 +25,8 @@ var parseServer = new ParseServer({
   cloud: process.env.CLOUD_PATH || __dirname + '/cloud/main.js',
   appId: process.env.APP_ID,
   masterKey: process.env.MASTER_KEY,
-  fileKey: process.env.FILE_KEY
+  fileKey: process.env.FILE_KEY,
+  serverURL: process.env.SERVER_URL
 });
 
 // Mount the Parse API server middleware to /parse
diff --git a/test/appengine/all.test.js b/test/appengine/all.test.js
index 48ef741012..b3ca3e83e7 100644
--- a/test/appengine/all.test.js
+++ b/test/appengine/all.test.js
@@ -239,7 +239,8 @@ if (process.env.TRAVIS_NODE_VERSION === 'stable') {
     TRAVIS_NODE_VERSION: 'stable',
     env: {
       APP_ID: 'foo',
-      MASTER_KEY: 'bar'
+      MASTER_KEY: 'bar',
+      SERVER_URL: 'http://localhost:'
     }
   });
 }
@@ -275,6 +276,10 @@ describe('appengine/', function () {
   sampleTests.forEach(function (sample) {
     sample.env = sample.env || {};
     sample.env.PORT = port;
+    if (sample.dir === 'parse-server') {
+      sample.env.SERVER_URL = sample.env.SERVER_URL + port + '/parse';
+      console.log(sample);
+    }
     port++;
     it(sample.dir + ': dependencies should install', function (done) {
       // Allow extra time for "npm install"