diff --git a/package.json b/package.json
index 9d4eaf0e5..7613cd2c4 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,8 @@
     "istanbul": "~0.2.6"
   },
   "testling": {
-    "files": "test/test*.js",
+    "harness": "mocha-tdd",
+    "html": "test/index-testling.html",
     "browsers": [
       "ie/6..latest",
       "chrome/22..latest",
diff --git a/test/index-testling.html b/test/index-testling.html
new file mode 100644
index 000000000..e6a9447f0
--- /dev/null
+++ b/test/index-testling.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Mocha</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="./node_modules/mocha/mocha.css" />
+  </head>
+  <body>
+    <div id="mocha"></div>
+    <script src="./node_modules/mocha/mocha.js"></script>
+    <script src="./node_modules/chai/chai.js"></script>
+    <script>mocha.setup('bdd')</script>
+    <script>mocha.reporter('tap')</script>
+    <script src="./browser/bundle.js"></script>
+    <script src="./browser/testdata.js"></script>
+    <script src="test/adapter.js"></script>
+
+    <script src="test/test.Address.js"></script>
+    <script src="test/test.basic.js"></script>
+    <script src="test/test.BIP32.js"></script>
+    <script src="test/test.Block.js"></script>
+    <script src="test/test.Bloom.js"></script>
+    <script src="test/test.Connection.js"></script>
+    <script src="test/test.EncodedData.js"></script>
+    <script src="test/test.Key.js"></script>
+    <script src="test/test.main.js"></script>
+    <script src="test/test.misc.js"></script>
+    <script src="test/test.Opcode.js"></script>
+    <script src="test/test.Peer.js"></script>
+    <script src="test/test.PeerManager.js"></script>
+    <script src="test/test.Point.js"></script>
+    <script src="test/test.PrivateKey.js"></script>
+    <script src="test/test.RpcClient.js"></script>
+    <script src="test/test.Script.js"></script>
+    <script src="test/test.ScriptInterpreter.js"></script>
+    <script src="test/test.sighash.js"></script>
+    <script src="test/test.SIN.js"></script>
+    <script src="test/test.SINKey.js"></script>
+    <script src="test/test.Transaction.js"></script>
+    <script src="test/test.TransactionBuilder.js"></script>
+    <script src="test/test.util.js"></script>
+    <script src="test/test.VersionedData.js"></script>
+    <script src="test/test.Wallet.js"></script>
+    <script src="test/test.WalletKey.js"></script>
+    <!--
+    -->
+    <script>
+      mocha.run();
+    </script>
+  </body>
+</html>
diff --git a/test/test.PeerManager.js b/test/test.PeerManager.js
index 5f3aa7f30..ab6565d4c 100644
--- a/test/test.PeerManager.js
+++ b/test/test.PeerManager.js
@@ -5,7 +5,7 @@ var bitcore = bitcore || require('../bitcore');
 
 var should = chai.should();
 
-var PeerManagerModule = bitcore.PeerManager || require('./PeerManager');
+var PeerManagerModule = bitcore.PeerManager;
 
 var PeerManager;
 
