diff --git a/.eslintrc.js b/.eslintrc.js
index 0b93f95e..a0b5d7bf 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -342,7 +342,7 @@ module.exports = {
     "no-mixed-operators": [ 2, {"groups": [["&", "|", "^", "~", "<<", ">>", ">>>"], ["&&", "||"]]}],
     "no-use-before-define": [ 2, { "functions": false, "classes": true, "variables": false }],
     "no-constant-condition": [ 2, { "checkLoops": false } ],
-    "new-cap": [ 2, { "properties": false, "capIsNewExceptionPattern": "CMAC|CBC|OMAC|CTR", "newIsCapExceptionPattern": "type|hash*"}],
+    "new-cap": [ 2, { "properties": false, "capIsNewExceptionPattern": "EAX|OCB|GCM|CMAC|CBC|OMAC|CTR", "newIsCapExceptionPattern": "type|hash*"}],
     "max-lines": [ 2, { "max": 600, "skipBlankLines": true, "skipComments": true } ],
     "no-unused-expressions": 0,
     "chai-friendly/no-unused-expressions": [ 2, { "allowShortCircuit": true } ],
diff --git a/test/crypto/aes_kw.js b/test/crypto/aes_kw.js
index c967c1ec..dcf7f689 100644
--- a/test/crypto/aes_kw.js
+++ b/test/crypto/aes_kw.js
@@ -1,4 +1,3 @@
-const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
 const aes_kw = require('../../src/crypto/aes_kw');
 const util = require('../../src/util');
 
diff --git a/test/crypto/cipher/aes.js b/test/crypto/cipher/aes.js
index 5d39fd5a..b8ebb5fb 100644
--- a/test/crypto/cipher/aes.js
+++ b/test/crypto/cipher/aes.js
@@ -1,4 +1,4 @@
-const { aes128 } = require('../../../src/crypto/cipher');
+const { aes128: AES128 } = require('../../../src/crypto/cipher');
 
 const chai = require('chai');
 
@@ -6,7 +6,7 @@ const { expect } = chai;
 
 module.exports = () => describe('AES Rijndael cipher test with test vectors from ecb_tbl.txt', function() {
   function test_aes(input, key, output) {
-    const aes = new aes128(new Uint8Array(key));
+    const aes = new AES128(new Uint8Array(key));
 
     const encrypted = aes.encrypt(new Uint8Array(input));
     expect(encrypted).to.deep.equal(new Uint8Array(output));
diff --git a/test/crypto/ocb.js b/test/crypto/ocb.js
index 15e609b5..e2c7f89f 100644
--- a/test/crypto/ocb.js
+++ b/test/crypto/ocb.js
@@ -2,7 +2,6 @@
 
 // Adapted from https://github.com/artjomb/cryptojs-extension/blob/8c61d159/test/eax.js
 
-const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../..');
 const OCB = require('../../src/crypto/ocb');
 const util = require('../../src/util');