diff --git a/popup.html b/popup.html
index 26e033cd4d..93c2123a1a 100644
--- a/popup.html
+++ b/popup.html
@@ -46,15 +46,8 @@
 	</div>
 	<script type="text/javascript" src="js-deps/nacl-common.js"></script>
 	<script type="text/javascript" src="js-deps/jquery.js"></script>
-	<script type="text/javascript" src="js-deps/core.js"></script>
-	<script type="text/javascript" src="js-deps/enc-base64.js"></script>
-	<script type="text/javascript" src="js-deps/cipher-core.js"></script>
-	<script type="text/javascript" src="js-deps/aes.js"></script>
-	<script type="text/javascript" src="js-deps/mode-ctr-min.js"></script>
-	<script type="text/javascript" src="js-deps/pad-nopadding.js"></script>
-	<script type="text/javascript" src="js-deps/hmac-sha256.js"></script>
+    <script type="text/javascript" src="js-deps/CryptoJS.js"></script>
 	<script type="text/javascript" src="js-deps/curve255.js"></script>
-	<script type="text/javascript" src="js-deps/lib-typedarrays.js"></script>
 	<script type="text/javascript" src="js-deps/Long.min.js"></script>
 	<script type="text/javascript" src="js-deps/ByteBuffer.min.js"></script>
 	<script type="text/javascript" src="js-deps/ProtoBuf.min.js"></script>
diff --git a/test.html b/test.html
index 81b94cbd7a..df9545fa41 100644
--- a/test.html
+++ b/test.html
@@ -24,23 +24,16 @@
 	<div id="tests">
 	</div>
 
-	<script type="text/javascript" src="js-deps/nacl-common.js"></script>
-	<script type="text/javascript" src="js-deps/jquery.js"></script>
-	<script type="text/javascript" src="js-deps/core.js"></script>
-	<script type="text/javascript" src="js-deps/enc-base64.js"></script>
-	<script type="text/javascript" src="js-deps/cipher-core.js"></script>
-	<script type="text/javascript" src="js-deps/aes.js"></script>
-	<script type="text/javascript" src="js-deps/mode-ctr-min.js"></script>
-	<script type="text/javascript" src="js-deps/pad-nopadding.js"></script>
-	<script type="text/javascript" src="js-deps/hmac-sha256.js"></script>
-	<script type="text/javascript" src="js-deps/curve255.js"></script>
-	<script type="text/javascript" src="js-deps/lib-typedarrays.js"></script>
-	<script type="text/javascript" src="js-deps/Long.min.js"></script>
-	<script type="text/javascript" src="js-deps/ByteBuffer.min.js"></script>
-	<script type="text/javascript" src="js-deps/ProtoBuf.min.js"></script>
-	<script type="text/javascript" src="js-deps/underscore.js"></script>
-	<script type="text/javascript" src="js-deps/backbone.js"></script>
-	<script type="text/javascript" src="js-deps/backbone.localStorage.js"></script>
+    <script type="text/javascript" src="js-deps/nacl-common.js"></script>
+    <script type="text/javascript" src="js-deps/jquery.js"></script>
+    <script type="text/javascript" src="js-deps/CryptoJS.js"></script>
+    <script type="text/javascript" src="js-deps/curve255.js"></script>
+    <script type="text/javascript" src="js-deps/Long.min.js"></script>
+    <script type="text/javascript" src="js-deps/ByteBuffer.min.js"></script>
+    <script type="text/javascript" src="js-deps/ProtoBuf.min.js"></script>
+    <script type="text/javascript" src="js-deps/underscore.js"></script>
+    <script type="text/javascript" src="js-deps/backbone.js"></script>
+    <script type="text/javascript" src="js-deps/backbone.localStorage.js"></script>
 
 	<script type="text/javascript" src="js/helpers.js"></script>
 	<script type="text/javascript" src="js/webcrypto.js"></script>