diff --git a/test/remote-connector.test.js b/test/remote-connector.test.js
index 720701ff..5118de64 100644
--- a/test/remote-connector.test.js
+++ b/test/remote-connector.test.js
@@ -25,13 +25,24 @@ describe('RemoteConnector', function() {
         done();
       });
     },
+
+    // We are defining the model attached to the remote connector datasource,
+    // therefore change tracking must be disabled, only the remote API for
+    // replication should be present
+    trackChanges: false,
+    enableRemoteReplication: true,
+
     onDefine: function(Model) {
-      var RemoteModel = Model.extend('Remote' + Model.modelName, {},
-        { plural: Model.pluralModelName });
-      RemoteModel.attachTo(loopback.createDataSource({
+      var ServerModel = Model.extend('Server' + Model.modelName, {}, {
+        plural: Model.pluralModelName,
+        // This is the model running on the server & attached to a real
+        // datasource, that's the place where to keep track of changes
+        trackChanges: true,
+      });
+      ServerModel.attachTo(loopback.createDataSource({
         connector: loopback.Memory,
       }));
-      remoteApp.model(RemoteModel);
+      remoteApp.model(ServerModel);
     },
   });
 
diff --git a/test/util/model-tests.js b/test/util/model-tests.js
index 814108e3..b6fea310 100644
--- a/test/util/model-tests.js
+++ b/test/util/model-tests.js
@@ -48,7 +48,8 @@ module.exports = function defineModelTestsWithDataSource(options) {
         'domain': String,
         'email': String,
       }, {
-        trackChanges: true,
+        trackChanges: options.trackChanges !== false,
+        enableRemoteReplication: options.enableRemoteReplication,
       });
 
       User.attachTo(dataSource);