diff --git a/.aegir.js b/.aegir.js
index a787ac4f..92fe923d 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -7,7 +7,7 @@ const Peers = require('./test/fixtures/peers')
 const PeerId = require('peer-id')
 const WebSockets = require('libp2p-websockets')
 const Muxer = require('libp2p-mplex')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 const pipe = require('it-pipe')
 let libp2p
 
diff --git a/examples/auto-relay/README.md b/examples/auto-relay/README.md
index fbb3b7a0..bad4f2b6 100644
--- a/examples/auto-relay/README.md
+++ b/examples/auto-relay/README.md
@@ -18,7 +18,7 @@ The relay node will need to have its relay subsystem enabled, as well as its HOP
 ```js
 const Libp2p = require('libp2p')
 const Websockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 const node = await Libp2p.create({
@@ -76,7 +76,7 @@ One of the typical use cases for Auto Relay is nodes behind a NAT or browser nod
 ```js
 const Libp2p = require('libp2p')
 const Websockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 const relayAddr = process.argv[2]
@@ -147,7 +147,7 @@ Now that you have a relay node and a node bound to that relay, you can test conn
 ```js
 const Libp2p = require('libp2p')
 const Websockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 const autoRelayNodeAddr = process.argv[2]
diff --git a/examples/auto-relay/dialer.js b/examples/auto-relay/dialer.js
index ebf5fd12..5f6423ed 100644
--- a/examples/auto-relay/dialer.js
+++ b/examples/auto-relay/dialer.js
@@ -2,7 +2,7 @@
 
 const Libp2p = require('libp2p')
 const Websockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 async function main () {
diff --git a/examples/auto-relay/listener.js b/examples/auto-relay/listener.js
index 0f943740..4f762c67 100644
--- a/examples/auto-relay/listener.js
+++ b/examples/auto-relay/listener.js
@@ -2,7 +2,7 @@
 
 const Libp2p = require('libp2p')
 const Websockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 async function main () {
diff --git a/examples/auto-relay/relay.js b/examples/auto-relay/relay.js
index 2a18c3a7..18a1df51 100644
--- a/examples/auto-relay/relay.js
+++ b/examples/auto-relay/relay.js
@@ -2,7 +2,7 @@
 
 const Libp2p = require('libp2p')
 const Websockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 async function main () {
diff --git a/examples/chat/src/libp2p.js b/examples/chat/src/libp2p.js
index c4bfb88d..fbce60e9 100644
--- a/examples/chat/src/libp2p.js
+++ b/examples/chat/src/libp2p.js
@@ -3,7 +3,7 @@
 const TCP = require('libp2p-tcp')
 const WS = require('libp2p-websockets')
 const mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const defaultsDeep = require('@nodeutils/defaults-deep')
 const libp2p = require('../../..')
 
diff --git a/examples/connection-encryption/1.js b/examples/connection-encryption/1.js
index 1d3f0bcb..0b869915 100644
--- a/examples/connection-encryption/1.js
+++ b/examples/connection-encryption/1.js
@@ -3,7 +3,7 @@
 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const pipe = require('it-pipe')
 
diff --git a/examples/connection-encryption/README.md b/examples/connection-encryption/README.md
index 2d1c0614..ac824bf9 100644
--- a/examples/connection-encryption/README.md
+++ b/examples/connection-encryption/README.md
@@ -8,13 +8,13 @@ A byproduct of having these encrypted communications modules is that we can auth
 
 # 1. Set up encrypted communications
 
-We will build this example on top of example for [Protocol and Stream Multiplexing](../protocol-and-stream-multiplexing). You will need the `libp2p-noise` module to complete it, go ahead and `npm install libp2p-noise`.
+We will build this example on top of example for [Protocol and Stream Multiplexing](../protocol-and-stream-multiplexing). You will need the `@chainsafe/libp2p-noise` module to complete it, go ahead and `npm install @chainsafe/libp2p-noise`.
 
 To add them to your libp2p configuration, all you have to do is:
 
 ```JavaScript
 const Libp2p = require('libp2p')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const createNode = () => {
   return Libp2p.create({
diff --git a/examples/discovery-mechanisms/1.js b/examples/discovery-mechanisms/1.js
index d5187fcd..8ac3cc48 100644
--- a/examples/discovery-mechanisms/1.js
+++ b/examples/discovery-mechanisms/1.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const Bootstrap = require('libp2p-bootstrap')
 
 const bootstrapers = require('./bootstrapers')
diff --git a/examples/discovery-mechanisms/2.js b/examples/discovery-mechanisms/2.js
index 15c801cd..bd5f8ddc 100644
--- a/examples/discovery-mechanisms/2.js
+++ b/examples/discovery-mechanisms/2.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MulticastDNS = require('libp2p-mdns')
 
 const createNode = async () => {
diff --git a/examples/discovery-mechanisms/3.js b/examples/discovery-mechanisms/3.js
index 6eaa96a9..4fb1be12 100644
--- a/examples/discovery-mechanisms/3.js
+++ b/examples/discovery-mechanisms/3.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
 const Bootstrap = require('libp2p-bootstrap')
 const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
diff --git a/examples/discovery-mechanisms/README.md b/examples/discovery-mechanisms/README.md
index e2c9e0ff..2db83431 100644
--- a/examples/discovery-mechanisms/README.md
+++ b/examples/discovery-mechanisms/README.md
@@ -168,7 +168,7 @@ You can create your libp2p nodes as follows:
 const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
 const Bootstrap = require('libp2p-bootstrap')
 const PubsubPeerDiscovery = require('libp2p-pubsub-peer-discovery')
diff --git a/examples/echo/src/libp2p.js b/examples/echo/src/libp2p.js
index 4f14a6e1..6bc1d729 100644
--- a/examples/echo/src/libp2p.js
+++ b/examples/echo/src/libp2p.js
@@ -3,7 +3,7 @@
 const TCP = require('libp2p-tcp')
 const WS = require('libp2p-websockets')
 const mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const defaultsDeep = require('@nodeutils/defaults-deep')
 const libp2p = require('../../..')
diff --git a/examples/libp2p-in-the-browser/index.js b/examples/libp2p-in-the-browser/index.js
index fe5e31af..397d1201 100644
--- a/examples/libp2p-in-the-browser/index.js
+++ b/examples/libp2p-in-the-browser/index.js
@@ -2,7 +2,7 @@ import 'babel-polyfill'
 import Libp2p from 'libp2p'
 import Websockets from 'libp2p-websockets'
 import WebRTCStar from 'libp2p-webrtc-star'
-import { NOISE } from 'libp2p-noise'
+import { NOISE } from '@chainsafe/libp2p-noise'
 import Mplex from 'libp2p-mplex'
 import Bootstrap from 'libp2p-bootstrap'
 
diff --git a/examples/libp2p-in-the-browser/package.json b/examples/libp2p-in-the-browser/package.json
index 3aa948d5..cf2fdc7d 100644
--- a/examples/libp2p-in-the-browser/package.json
+++ b/examples/libp2p-in-the-browser/package.json
@@ -18,7 +18,7 @@
     "libp2p": "../../",
     "libp2p-bootstrap": "^0.13.0",
     "libp2p-mplex": "^0.10.4",
-    "libp2p-noise": "^4.0.0",
+    "@chainsafe/libp2p-noise": "^4.1.0",
     "libp2p-webrtc-star": "^0.23.0",
     "libp2p-websockets": "^0.16.1"
   },
diff --git a/examples/peer-and-content-routing/1.js b/examples/peer-and-content-routing/1.js
index 46c54f1d..bf2c6d1b 100644
--- a/examples/peer-and-content-routing/1.js
+++ b/examples/peer-and-content-routing/1.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const KadDHT = require('libp2p-kad-dht')
 
 const delay = require('delay')
diff --git a/examples/peer-and-content-routing/2.js b/examples/peer-and-content-routing/2.js
index 928234b2..4b528e4a 100644
--- a/examples/peer-and-content-routing/2.js
+++ b/examples/peer-and-content-routing/2.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const { CID } = require('multiformats/cid')
 const KadDHT = require('libp2p-kad-dht')
 
diff --git a/examples/pnet/libp2p-node.js b/examples/pnet/libp2p-node.js
index 8fc8a01f..8c01fde9 100644
--- a/examples/pnet/libp2p-node.js
+++ b/examples/pnet/libp2p-node.js
@@ -3,7 +3,7 @@
 const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const Protector = require('libp2p/src/pnet')
 
 /**
diff --git a/examples/protocol-and-stream-muxing/1.js b/examples/protocol-and-stream-muxing/1.js
index 70ee3175..5499ba0b 100644
--- a/examples/protocol-and-stream-muxing/1.js
+++ b/examples/protocol-and-stream-muxing/1.js
@@ -3,7 +3,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const pipe = require('it-pipe')
 
diff --git a/examples/protocol-and-stream-muxing/2.js b/examples/protocol-and-stream-muxing/2.js
index 3ac6bd42..2fecbe32 100644
--- a/examples/protocol-and-stream-muxing/2.js
+++ b/examples/protocol-and-stream-muxing/2.js
@@ -3,7 +3,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const pipe = require('it-pipe')
 
diff --git a/examples/protocol-and-stream-muxing/3.js b/examples/protocol-and-stream-muxing/3.js
index bd15f55f..23cf4e76 100644
--- a/examples/protocol-and-stream-muxing/3.js
+++ b/examples/protocol-and-stream-muxing/3.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const MPLEX = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const pipe = require('it-pipe')
 
diff --git a/examples/pubsub/1.js b/examples/pubsub/1.js
index 6d9b0fa7..c4eed3d0 100644
--- a/examples/pubsub/1.js
+++ b/examples/pubsub/1.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
 const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
diff --git a/examples/pubsub/message-filtering/1.js b/examples/pubsub/message-filtering/1.js
index dc1fe581..fce8d041 100644
--- a/examples/pubsub/message-filtering/1.js
+++ b/examples/pubsub/message-filtering/1.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../../../')
 const TCP = require('libp2p-tcp')
 const Mplex = require('libp2p-mplex')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const Gossipsub = require('libp2p-gossipsub')
 const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 const { toString: uint8ArrayToString } = require('uint8arrays/to-string')
diff --git a/examples/transports/1.js b/examples/transports/1.js
index 73857aad..81d8a2bc 100644
--- a/examples/transports/1.js
+++ b/examples/transports/1.js
@@ -3,7 +3,7 @@
 
 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const createNode = async () => {
   const node = await Libp2p.create({
diff --git a/examples/transports/2.js b/examples/transports/2.js
index 2d62849d..ee1f1c83 100644
--- a/examples/transports/2.js
+++ b/examples/transports/2.js
@@ -3,7 +3,7 @@
 
 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 const pipe = require('it-pipe')
diff --git a/examples/transports/3.js b/examples/transports/3.js
index c6924443..90fc1b17 100644
--- a/examples/transports/3.js
+++ b/examples/transports/3.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
 const WebSockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 const pipe = require('it-pipe')
diff --git a/examples/transports/4.js b/examples/transports/4.js
index 487315ec..b46d1473 100644
--- a/examples/transports/4.js
+++ b/examples/transports/4.js
@@ -4,7 +4,7 @@
 const Libp2p = require('../..')
 const TCP = require('libp2p-tcp')
 const WebSockets = require('libp2p-websockets')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 
 const fs = require('fs');
diff --git a/examples/transports/README.md b/examples/transports/README.md
index 8378c9a3..8c9d23b9 100644
--- a/examples/transports/README.md
+++ b/examples/transports/README.md
@@ -13,7 +13,7 @@ When using libp2p, you need properly configure it, that is, pick your set of mod
 You will need 4 dependencies total, so go ahead and install all of them with:
 
 ```bash
-> npm install libp2p libp2p-tcp libp2p-noise
+> npm install libp2p libp2p-tcp @chainsafe/libp2p-noise
 ```
 
 Then, in your favorite text editor create a file with the `.js` extension. I've called mine `1.js`.
@@ -25,7 +25,7 @@ First thing is to create our own libp2p node! Insert:
 
 const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
-const { NOISE } = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 
 const createNode = async () => {
   const node = await Libp2p.create({
diff --git a/examples/webrtc-direct/dialer.js b/examples/webrtc-direct/dialer.js
index a7ba8558..b08720c2 100644
--- a/examples/webrtc-direct/dialer.js
+++ b/examples/webrtc-direct/dialer.js
@@ -2,7 +2,7 @@ import 'babel-polyfill'
 const Libp2p = require('libp2p')
 const WebRTCDirect = require('libp2p-webrtc-direct')
 const Mplex = require('libp2p-mplex')
-const {NOISE} = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const Bootstrap = require('libp2p-bootstrap')
 
 document.addEventListener('DOMContentLoaded', async () => {
diff --git a/examples/webrtc-direct/listener.js b/examples/webrtc-direct/listener.js
index 47f3a971..a8ac6cd9 100644
--- a/examples/webrtc-direct/listener.js
+++ b/examples/webrtc-direct/listener.js
@@ -2,7 +2,7 @@ const Libp2p = require('libp2p')
 const Bootstrap = require('libp2p-bootstrap')
 const WebRTCDirect = require('libp2p-webrtc-direct')
 const Mplex = require('libp2p-mplex')
-const {NOISE} = require('libp2p-noise')
+const { NOISE } = require('@chainsafe/libp2p-noise')
 const PeerId = require('peer-id')
 
 ;(async () => {
diff --git a/examples/webrtc-direct/package.json b/examples/webrtc-direct/package.json
index c04ad84f..a1ef5448 100644
--- a/examples/webrtc-direct/package.json
+++ b/examples/webrtc-direct/package.json
@@ -23,7 +23,7 @@
     "libp2p": "../../",
     "libp2p-bootstrap": "^0.13.0",
     "libp2p-mplex": "^0.10.4",
-    "libp2p-noise": "^4.0.0",
+    "@chainsafe/libp2p-noise": "^4.1.0",
     "libp2p-webrtc-direct": "^0.7.0",
     "peer-id": "^0.15.0"
   },
diff --git a/package.json b/package.json
index b0d64662..5e7136a3 100644
--- a/package.json
+++ b/package.json
@@ -130,6 +130,7 @@
     "xsalsa20": "^1.1.0"
   },
   "devDependencies": {
+    "@chainsafe/libp2p-noise": "^4.0.0",
     "@nodeutils/defaults-deep": "^1.1.0",
     "@types/es6-promisify": "^6.0.0",
     "@types/node": "^16.0.1",
@@ -150,12 +151,11 @@
     "libp2p-delegated-content-routing": "^0.11.0",
     "libp2p-delegated-peer-routing": "^0.10.0",
     "libp2p-floodsub": "^0.27.0",
-    "libp2p-gossipsub": "^0.10.0",
+    "libp2p-gossipsub": "^0.11.0",
     "libp2p-interfaces-compliance-tests": "^1.0.0",
     "libp2p-kad-dht": "^0.23.0",
     "libp2p-mdns": "^0.17.0",
     "libp2p-mplex": "^0.10.1",
-    "libp2p-noise": "^4.0.0",
     "libp2p-tcp": "^0.17.0",
     "libp2p-webrtc-star": "^0.23.0",
     "libp2p-websockets": "^0.16.0",
diff --git a/test/configuration/utils.js b/test/configuration/utils.js
index c1a7aa5c..2e3ec538 100644
--- a/test/configuration/utils.js
+++ b/test/configuration/utils.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Pubsub = require('libp2p-interfaces/src/pubsub')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 const Muxer = require('libp2p-mplex')
 const Transport = require('libp2p-websockets')
 const filters = require('libp2p-websockets/src/filters')
diff --git a/test/core/consume-peer-record.spec.js b/test/core/consume-peer-record.spec.js
index c20a5efa..609a6c29 100644
--- a/test/core/consume-peer-record.spec.js
+++ b/test/core/consume-peer-record.spec.js
@@ -2,7 +2,7 @@
 /* eslint-env mocha */
 
 const Transport = require('libp2p-websockets')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 
 const Libp2p = require('../../src')
 const { createPeerId } = require('../utils/creators/peer')
diff --git a/test/core/encryption.spec.js b/test/core/encryption.spec.js
index bac84be8..da5c6e11 100644
--- a/test/core/encryption.spec.js
+++ b/test/core/encryption.spec.js
@@ -4,7 +4,7 @@
 const { expect } = require('aegir/utils/chai')
 
 const Transport = require('libp2p-websockets')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 
 const Libp2p = require('../../src')
 const { codes: ErrorCodes } = require('../../src/errors')
diff --git a/test/core/listening.node.js b/test/core/listening.node.js
index 7e948ca8..c83c6d89 100644
--- a/test/core/listening.node.js
+++ b/test/core/listening.node.js
@@ -4,7 +4,7 @@
 const { expect } = require('aegir/utils/chai')
 
 const Transport = require('libp2p-tcp')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 
 const { create } = require('../../src')
 const peerUtils = require('../utils/creators/peer')
diff --git a/test/dialing/direct.node.js b/test/dialing/direct.node.js
index 74b3989c..57a80084 100644
--- a/test/dialing/direct.node.js
+++ b/test/dialing/direct.node.js
@@ -5,7 +5,7 @@ const { expect } = require('aegir/utils/chai')
 const sinon = require('sinon')
 const Transport = require('libp2p-tcp')
 const Muxer = require('libp2p-mplex')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 const { Multiaddr } = require('multiaddr')
 const PeerId = require('peer-id')
 const delay = require('delay')
diff --git a/test/dialing/direct.spec.js b/test/dialing/direct.spec.js
index a24a1ca2..7f56b91d 100644
--- a/test/dialing/direct.spec.js
+++ b/test/dialing/direct.spec.js
@@ -9,7 +9,7 @@ const delay = require('delay')
 const Transport = require('libp2p-websockets')
 const filters = require('libp2p-websockets/src/filters')
 const Muxer = require('libp2p-mplex')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 const { Multiaddr } = require('multiaddr')
 const AggregateError = require('aggregate-error')
 const { AbortError } = require('libp2p-interfaces/src/transport/errors')
diff --git a/test/transports/transport-manager.spec.js b/test/transports/transport-manager.spec.js
index 75bb1b91..1fb5be1e 100644
--- a/test/transports/transport-manager.spec.js
+++ b/test/transports/transport-manager.spec.js
@@ -7,7 +7,7 @@ const sinon = require('sinon')
 const { Multiaddr } = require('multiaddr')
 const Transport = require('libp2p-websockets')
 const filters = require('libp2p-websockets/src/filters')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 const AddressManager = require('../../src/address-manager')
 const TransportManager = require('../../src/transport-manager')
 const mockUpgrader = require('../utils/mockUpgrader')
diff --git a/test/ts-use/package.json b/test/ts-use/package.json
index 8a0670c6..6445e42f 100644
--- a/test/ts-use/package.json
+++ b/test/ts-use/package.json
@@ -12,7 +12,7 @@
     "libp2p-interfaces": "^1.0.1",
     "libp2p-kad-dht": "^0.23.1",
     "libp2p-mplex": "^0.10.4",
-    "libp2p-noise": "^4.0.0",
+    "@chainsafe/libp2p-noise": "^4.1.0",
     "libp2p-record": "^0.10.4",
     "libp2p-tcp": "^0.17.1",
     "libp2p-websockets": "^0.16.1",
diff --git a/test/ts-use/src/main.ts b/test/ts-use/src/main.ts
index 3d18cd3a..d75a79f4 100644
--- a/test/ts-use/src/main.ts
+++ b/test/ts-use/src/main.ts
@@ -3,7 +3,7 @@ import Libp2pRecord = require('libp2p-record')
 import TCP = require('libp2p-tcp')
 
 const WEBSOCKETS = require('libp2p-websockets')
-const NOISE = require('libp2p-noise')
+const NOISE = require('@chainsafe/libp2p-noise')
 const MPLEX = require('libp2p-mplex')
 const Gossipsub = require('libp2p-gossipsub')
 const DHT = require('libp2p-kad-dht')
diff --git a/test/upgrading/upgrader.spec.js b/test/upgrading/upgrader.spec.js
index 36ed56c2..e78f7007 100644
--- a/test/upgrading/upgrader.spec.js
+++ b/test/upgrading/upgrader.spec.js
@@ -10,7 +10,7 @@ const pipe = require('it-pipe')
 const { collect } = require('streaming-iterables')
 const pSettle = require('p-settle')
 const Transport = require('libp2p-websockets')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 const Protector = require('../../src/pnet')
 const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 const swarmKeyBuffer = uint8ArrayFromString(require('../fixtures/swarm.key'))
diff --git a/test/utils/base-options.browser.js b/test/utils/base-options.browser.js
index d033a4c9..1d8b5941 100644
--- a/test/utils/base-options.browser.js
+++ b/test/utils/base-options.browser.js
@@ -3,7 +3,7 @@
 const Transport = require('libp2p-websockets')
 const filters = require('libp2p-websockets/src/filters')
 const Muxer = require('libp2p-mplex')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 
 const transportKey = Transport.prototype[Symbol.toStringTag]
 
diff --git a/test/utils/base-options.js b/test/utils/base-options.js
index e2db4f85..e403ff0f 100644
--- a/test/utils/base-options.js
+++ b/test/utils/base-options.js
@@ -2,7 +2,7 @@
 
 const Transport = require('libp2p-tcp')
 const Muxer = require('libp2p-mplex')
-const { NOISE: Crypto } = require('libp2p-noise')
+const { NOISE: Crypto } = require('@chainsafe/libp2p-noise')
 
 module.exports = {
   modules: {