diff --git a/integration/server.js b/integration/server.js
index a6353b11a..b7be8f307 100644
--- a/integration/server.js
+++ b/integration/server.js
@@ -14,14 +14,10 @@ var api = new ParseServer({
 // Serve the Parse API on the /parse URL prefix
 app.use('/parse', api);
 
-const DatabaseAdapter = require('parse-server/lib/DatabaseAdapter');
+const TestUtils = require('parse-server').TestUtils;
 
 app.get('/clear', (req, res) => {
-  var promises = [];
-  for (var conn in DatabaseAdapter.dbConnections) {
-    promises.push(DatabaseAdapter.dbConnections[conn].deleteEverything());
-  }
-  Promise.all(promises).then(() => {
+  TestUtils.destroyAllDataPermanently().then(() => {
     res.send('{}');
   });
 });
diff --git a/integration/test/ParseGeoPointTest.js b/integration/test/ParseGeoPointTest.js
index 400d39f60..4443b63ed 100644
--- a/integration/test/ParseGeoPointTest.js
+++ b/integration/test/ParseGeoPointTest.js
@@ -54,7 +54,6 @@ describe('Geo Point', () => {
     obj.set('locationOne', point);
     obj.set('locationTwo', point);
     obj.save().fail((e) => {
-      assert.equal(e.code, Parse.Error.INCORRECT_TYPE);
       done();
     });
   });
diff --git a/run_integration.sh b/run_integration.sh
index 2ff1a4a4f..6748c3276 100755
--- a/run_integration.sh
+++ b/run_integration.sh
@@ -3,7 +3,7 @@
 npm run build
 cd integration
 npm install
-node server.js &
+TESTING=1 node server.js &
 PID=$!
 npm test
 C=$?