diff --git a/package-lock.json b/package-lock.json
index 842ec324c..029ecf9ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -73,11 +73,13 @@
       "dev": true
     },
     "aes-decrypter": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-1.0.3.tgz",
-      "integrity": "sha1-nAa4pUNaWtCduTP4oBSvzxhMw04=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.0.0.tgz",
+      "integrity": "sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=",
       "requires": {
-        "pkcs7": "0.2.3"
+        "commander": "2.11.0",
+        "global": "4.3.2",
+        "pkcs7": "1.0.2"
       }
     },
     "after": {
@@ -1363,10 +1365,9 @@
       }
     },
     "commander": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-      "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
-      "dev": true
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
     },
     "compare-func": {
       "version": "1.3.2",
@@ -6910,9 +6911,9 @@
       }
     },
     "pkcs7": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-0.2.3.tgz",
-      "integrity": "sha1-ItYGZtAQZcXyRDkJjkpIMEUic74="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pkcs7/-/pkcs7-1.0.2.tgz",
+      "integrity": "sha1-ttulJ1KMKUK/wSLOLa/NteWQdOc="
     },
     "pkg-config": {
       "version": "1.1.1",
@@ -8319,7 +8320,6 @@
       "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
       "dev": true,
       "requires": {
-        "commander": "2.13.0",
         "source-map": "0.6.1"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index a81070013..68620aa77 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "dist/"
   ],
   "dependencies": {
-    "aes-decrypter": "1.0.3",
+    "aes-decrypter": "3.0.0",
     "global": "^4.3.0",
     "m3u8-parser": "4.2.0",
     "mpd-parser": "0.6.0",
diff --git a/src/decrypter-worker.js b/src/decrypter-worker.js
index 21756a270..a22d202eb 100644
--- a/src/decrypter-worker.js
+++ b/src/decrypter-worker.js
@@ -1,9 +1,7 @@
 import window from 'global/window';
-import aesDecrypter from 'aes-decrypter';
+import { Decrypter } from 'aes-decrypter';
 import { createTransferableMessage } from './bin-utils';
 
-const { Decrypter } = aesDecrypter;
-
 /**
  * Our web worker interface so that things can talk to aes-decrypter
  * that will be running in a web worker. the scope is passed to this by
diff --git a/src/videojs-http-streaming.js b/src/videojs-http-streaming.js
index e1c2e8b1e..620305e65 100644
--- a/src/videojs-http-streaming.js
+++ b/src/videojs-http-streaming.js
@@ -8,7 +8,7 @@ import document from 'global/document';
 import PlaylistLoader from './playlist-loader';
 import Playlist from './playlist';
 import xhrFactory from './xhr';
-import aesDecrypter from 'aes-decrypter';
+import { Decrypter, AsyncStream, decrypt } from 'aes-decrypter';
 import * as utils from './bin-utils';
 import { timeRangesToArray } from './ranges';
 import { MediaSource, URL } from './mse/index';
@@ -26,8 +26,6 @@ import {
 } from './playlist-selectors.js';
 import { version } from '../package.json';
 
-const { Decrypter, AsyncStream, decrypt } = aesDecrypter;
-
 const Hls = {
   PlaylistLoader,
   Playlist,
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 8e6f44d3e..63edf81f9 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -16,7 +16,7 @@ module.exports = function(config) {
       clearContext: false,
       qunit: {
         showUI: true,
-        testTimeout: 5000
+        testTimeout: 30000
       }
     },
     files: [