diff --git a/src/handshakes/abstract-handshake.ts b/src/handshakes/abstract-handshake.ts
index c9db6df..85d63b7 100644
--- a/src/handshakes/abstract-handshake.ts
+++ b/src/handshakes/abstract-handshake.ts
@@ -1,5 +1,7 @@
 import {Buffer} from "buffer";
-import { AEAD, x25519, SHA256 } from 'bcrypto';
+import AEAD from 'bcrypto/lib/js/aead';
+import x25519 from 'bcrypto/lib/js/x25519';
+import SHA256 from 'bcrypto/lib/js/sha256';
 
 import {bytes, bytes32, uint32} from "../@types/basic";
 import {CipherState, MessageBuffer, SymmetricState} from "../@types/handshake";
diff --git a/src/noise.ts b/src/noise.ts
index 8372197..aa6d12d 100644
--- a/src/noise.ts
+++ b/src/noise.ts
@@ -1,4 +1,4 @@
-import {x25519} from 'bcrypto';
+import x25519 from 'bcrypto/lib/js/x25519';
 import {Buffer} from "buffer";
 import Wrap from 'it-pb-rpc';
 import DuplexPair from 'it-pair/duplex';
diff --git a/src/utils.ts b/src/utils.ts
index a4004f9..4be4951 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,7 +1,9 @@
-import {HKDF, SHA256, x25519} from 'bcrypto';
+import HKDF from 'bcrypto/lib/hkdf';
+import x25519 from 'bcrypto/lib/js/x25519';
+import SHA256 from 'bcrypto/lib/js/sha256';
 import {Buffer} from "buffer";
 import PeerId from "peer-id";
-import * as crypto from 'libp2p-crypto';
+import {keys} from 'libp2p-crypto';
 import {KeyPair} from "./@types/libp2p";
 import {bytes, bytes32} from "./@types/basic";
 import {Hkdf, INoisePayload} from "./@types/handshake";
@@ -91,7 +93,7 @@ export async function verifySignedPayload(
   }
   const generatedPayload = getHandshakePayload(noiseStaticKey);
   // Unmarshaling from PublicKey protobuf
-  const publicKey = crypto.keys.unmarshalPublicKey(identityKey);
+  const publicKey = keys.unmarshalPublicKey(identityKey);
   if (!publicKey.verify(generatedPayload, payload.identitySig)) {
     throw new Error("Static key doesn't match to peer that signed payload!");
   }
diff --git a/test/noise.test.ts b/test/noise.test.ts
index e1ac841..c770396 100644
--- a/test/noise.test.ts
+++ b/test/noise.test.ts
@@ -3,7 +3,7 @@ import DuplexPair from 'it-pair/duplex';
 import {Noise} from "../src";
 import {createPeerIdsFromFixtures} from "./fixtures/peer";
 import Wrap from "it-pb-rpc";
-import {random} from "bcrypto";
+import random from "bcrypto/lib/js/random";
 import sinon from "sinon";
 import {XXHandshake} from "../src/handshake-xx";
 import {createHandshakePayload, generateKeypair, getHandshakePayload, getPayload, signPayload} from "../src/utils";
diff --git a/test/utils.ts b/test/utils.ts
index 2ac5b7b..29a5b06 100644
--- a/test/utils.ts
+++ b/test/utils.ts
@@ -1,8 +1,9 @@
-import * as crypto from 'libp2p-crypto';
-import {KeyPair, PeerId} from "../src/@types/libp2p";
+import {keys} from 'libp2p-crypto';
+import {KeyPair} from "../src/@types/libp2p";
+import PeerId from "peer-id";
 
 export async function generateEd25519Keys() {
-  return await crypto.keys.generateKeyPair('ed25519');
+  return await keys.generateKeyPair('ed25519');
 }
 
 export function getKeyPairFromPeerId(peerId: PeerId): KeyPair {