3 files changed, 19 insertions, 6 deletions
diff --git a/javascript/test/megolm.spec.js b/javascript/test/megolm.spec.js
index 8f9d24a..9d5eb72 100644
--- a/javascript/test/megolm.spec.js
+++ b/javascript/test/megolm.spec.js
@@ -16,12 +16,15 @@ limitations under the License.
 
 "use strict";
 
-var Olm = require('../olm');
+var Olm = require('../olm')();
 
 describe("megolm", function() {
     var aliceSession, bobSession;
 
-    beforeEach(function() {
+    beforeEach(function(done) {
+        Olm.then(function() {
+            done();
+        });
         aliceSession = new Olm.OutboundGroupSession();
         bobSession = new Olm.InboundGroupSession();
     });
diff --git a/javascript/test/olm.spec.js b/javascript/test/olm.spec.js
index b7cc3ae..94fa87b 100644
--- a/javascript/test/olm.spec.js
+++ b/javascript/test/olm.spec.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 "use strict";
 
-var Olm = require('../olm');
+var Olm = require('../olm')();
 
 if (!Object.keys) {
     Object.keys = function(o) {
@@ -30,7 +30,13 @@ describe("olm", function() {
     var aliceAccount, bobAccount;
     var aliceSession, bobSession;
 
-    beforeEach(function() {
+    beforeEach(function(done) {
+        // This should really be in a beforeAll, but jasmine-node
+        // doesn't support that
+        Olm.then(function() {
+            done();
+        });
+
         aliceAccount = new Olm.Account();
         bobAccount = new Olm.Account();
         aliceSession = new Olm.Session();
diff --git a/javascript/test/pk.spec.js b/javascript/test/pk.spec.js
index aec90ac..9f7dbfd 100644
--- a/javascript/test/pk.spec.js
+++ b/javascript/test/pk.spec.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 "use strict";
 
-var Olm = require('../olm');
+var Olm = require('../olm')();
 
 if (!Object.keys) {
     Object.keys = function(o) {
@@ -29,7 +29,11 @@ if (!Object.keys) {
 describe("pk", function() {
     var encryption, decryption;
 
-    beforeEach(function() {
+    beforeEach(function(done) {
+        Olm.then(function() {
+            done();
+        });
+
         encryption = new Olm.PkEncryption();
         decryption = new Olm.PkDecryption();
     });