diff --git a/Gruntfile.js b/Gruntfile.js
index 2b745116..5b64cd37 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -48,7 +48,7 @@ module.exports = function(grunt) {
           'test/lib/unittests-bundle.js': [ './test/unittests.js' ]
         },
         options: {
-          external: [ 'openpgp']
+          external: ['crypto', 'node-localstorage', 'openpgp', '../../../dist/openpgp', '../../dist/openpgp']
         }
       }
     },
diff --git a/test/crypto/cipher/aes.js b/test/crypto/cipher/aes.js
index 833e3f90..335160f7 100644
--- a/test/crypto/cipher/aes.js
+++ b/test/crypto/cipher/aes.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/cipher/blowfish.js b/test/crypto/cipher/blowfish.js
index 2600a06b..232d7366 100644
--- a/test/crypto/cipher/blowfish.js
+++ b/test/crypto/cipher/blowfish.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   BFencrypt = openpgp.crypto.cipher.blowfish,
diff --git a/test/crypto/cipher/cast5.js b/test/crypto/cipher/cast5.js
index 6a222fde..5bbf02da 100644
--- a/test/crypto/cipher/cast5.js
+++ b/test/crypto/cipher/cast5.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/cipher/des.js b/test/crypto/cipher/des.js
index 64149e23..27239b93 100644
--- a/test/crypto/cipher/des.js
+++ b/test/crypto/cipher/des.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/cipher/twofish.js b/test/crypto/cipher/twofish.js
index 0ad46dde..169e43ec 100644
--- a/test/crypto/cipher/twofish.js
+++ b/test/crypto/cipher/twofish.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   chai = require('chai'),
diff --git a/test/crypto/crypto.js b/test/crypto/crypto.js
index 60afa1c8..f76ee68c 100644
--- a/test/crypto/crypto.js
+++ b/test/crypto/crypto.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var chai = require('chai'),
 	expect = chai.expect;
diff --git a/test/crypto/hash/md5.js b/test/crypto/hash/md5.js
index fb431b0a..43fbec79 100644
--- a/test/crypto/hash/md5.js
+++ b/test/crypto/hash/md5.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   MD5 = openpgp.crypto.hash.md5,
diff --git a/test/crypto/hash/ripemd.js b/test/crypto/hash/ripemd.js
index df153e04..4d998be9 100644
--- a/test/crypto/hash/ripemd.js
+++ b/test/crypto/hash/ripemd.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   RMDstring = openpgp.crypto.hash.ripemd,
diff --git a/test/crypto/hash/sha.js b/test/crypto/hash/sha.js
index cd4166d0..a304c895 100644
--- a/test/crypto/hash/sha.js
+++ b/test/crypto/hash/sha.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../../dist/openpgp');
 
 var util = openpgp.util,
   hash = openpgp.crypto.hash,
diff --git a/test/general/armor.js b/test/general/armor.js
index 22535b17..f5ceb2e3 100644
--- a/test/general/armor.js
+++ b/test/general/armor.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var chai = require('chai'),
   expect = chai.expect;
diff --git a/test/general/basic.js b/test/general/basic.js
index 2ecd584d..616399ff 100644
--- a/test/general/basic.js
+++ b/test/general/basic.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var chai = require('chai'),
   expect = chai.expect;
diff --git a/test/general/hkp.js b/test/general/hkp.js
index 3f0757c0..568e4a89 100644
--- a/test/general/hkp.js
+++ b/test/general/hkp.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 var fetch = typeof window !== 'undefined' ? window.fetch : require('node-fetch');
 
 var chai = require('chai'),
diff --git a/test/general/key.js b/test/general/key.js
index 044ed38d..50e52c3f 100644
--- a/test/general/key.js
+++ b/test/general/key.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var chai = require('chai'),
 	expect = chai.expect;
diff --git a/test/general/keyring.js b/test/general/keyring.js
index e8c4d311..39962f73 100644
--- a/test/general/keyring.js
+++ b/test/general/keyring.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var keyring = new openpgp.Keyring(),
   chai = require('chai'),
diff --git a/test/general/packet.js b/test/general/packet.js
index e32ba5ab..82904fe5 100644
--- a/test/general/packet.js
+++ b/test/general/packet.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var chai = require('chai'),
   expect = chai.expect;
diff --git a/test/general/signature.js b/test/general/signature.js
index 33dbb9ea..e6d3a7cb 100644
--- a/test/general/signature.js
+++ b/test/general/signature.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var chai = require('chai'),
 	expect = chai.expect;
diff --git a/test/worker/api.js b/test/worker/api.js
index 9be31c7d..3fac8a94 100644
--- a/test/worker/api.js
+++ b/test/worker/api.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../src/index');
+var openpgp = typeof window != 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
 
 var chai = require('chai'),
   expect = chai.expect;