diff --git a/CHANGELOG.md b/CHANGELOG.md
index 801fbd21..c258107c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+X.Y.Z Release notes
+=============================================================
+### Breaking changes
+* None.
+
+### Enhancements
+* None.
+
+### Bug fixes
+* [Object Server] Fixed a bug in upload progress reporting.
+
+### Internal
+* None.
+
 2.2.2 Release notes (2018-1-16)
 =============================================================
 ### Breaking changes
diff --git a/dependencies.list b/dependencies.list
index 019cb691..33d20f68 100644
--- a/dependencies.list
+++ b/dependencies.list
@@ -2,4 +2,4 @@ PACKAGE_NAME=realm-js
 VERSION=2.2.2
 REALM_CORE_VERSION=5.1.2
 REALM_SYNC_VERSION=2.2.9
-REALM_OBJECT_SERVER_VERSION=2.2.0
+REALM_OBJECT_SERVER_VERSION=2.5.1
diff --git a/src/object-store b/src/object-store
index 8517ee7f..9aab0ffd 160000
--- a/src/object-store
+++ b/src/object-store
@@ -1 +1 @@
-Subproject commit 8517ee7f4378fe0f54945b3e4973766ff65e455d
+Subproject commit 9aab0ffd5bc7bfc438ec28375ba581cf732f57ee
diff --git a/tests/js/session-tests.js b/tests/js/session-tests.js
index 25232d84..56813104 100644
--- a/tests/js/session-tests.js
+++ b/tests/js/session-tests.js
@@ -542,12 +542,17 @@ module.exports = {
                     schema: [{ name: 'Dog', properties: { name: 'string' } }],
                 };
 
-                const realm = new Realm(config);
-                return new Promise((resolve, reject) => {
-                    realm.syncSession.addProgressNotification('download', 'reportIndefinitely', resolve);
-                    setTimeout(function() {
-                        reject("Progress Notifications API failed to call progress callback for Realm constructor");
-                    }, 5000);
+                return Realm.open(config).then((realm) => {
+                    return new Promise((resolve, reject) => {
+                        realm.syncSession.addProgressNotification('download', 'reportIndefinitely', (x, y) => {
+                            if (x === y) {
+                                resolve();
+                            }
+                        });
+                        setTimeout(function() {
+                            reject("Progress Notifications API failed to call progress callback for Realm constructor");
+                        }, 5000);
+                    });
                 });
             });
     },