diff --git a/libtextsecure/test/generate_keys_test.js b/libtextsecure/test/generate_keys_test.js
index 21cef1bd7aed..2803354ac1cf 100644
--- a/libtextsecure/test/generate_keys_test.js
+++ b/libtextsecure/test/generate_keys_test.js
@@ -59,7 +59,8 @@ describe("Key generation", function() {
          * }
          */
         before(function(done) {
-            generateKeys(count).then(function(res) {
+            var accountManager = new textsecure.AccountManager('');
+            accountManager.generateKeys(count).then(function(res) {
                 result = res;
             }).then(done,done);
         });
@@ -94,7 +95,8 @@ describe("Key generation", function() {
     describe('the second time', function() {
         var result;
         before(function(done) {
-            generateKeys(count).then(function(res) {
+            var accountManager = new textsecure.AccountManager('');
+            accountManager.generateKeys(count).then(function(res) {
                 result = res;
             }).then(done,done);
         });
@@ -129,7 +131,8 @@ describe("Key generation", function() {
     describe('the third time', function() {
         var result;
         before(function(done) {
-            generateKeys(count).then(function(res) {
+            var accountManager = new textsecure.AccountManager('');
+            accountManager.generateKeys(count).then(function(res) {
                 result = res;
             }).then(done,done);
         });
diff --git a/libtextsecure/test/index.html b/libtextsecure/test/index.html
index 837b5363dfad..e6d935adc67b 100644
--- a/libtextsecure/test/index.html
+++ b/libtextsecure/test/index.html
@@ -24,7 +24,6 @@
   <script type="text/javascript" src="../libaxolotl.js"></script>
   <script type="text/javascript" src="../axolotl_wrapper.js" data-cover></script>
 
-  <script type="text/javascript" src="../websocket.js" data-cover></script>
   <script type="text/javascript" src="../websocket-resources.js" data-cover></script>
   <script type="text/javascript" src="../helpers.js" data-cover></script>
   <script type="text/javascript" src="../stringview.js" data-cover></script>
@@ -40,7 +39,6 @@
   <script type="text/javascript" src="device_storage_test.js"></script>
   <script type="text/javascript" src="contacts_parser_test.js"></script>
   <script type="text/javascript" src="generate_keys_test.js"></script>
-  <script type="text/javascript" src="websocket_test.js"></script>
   <script type="text/javascript" src="websocket-resources_test.js"></script>
 </body>
 </html>