diff --git a/.aegir.js b/.aegir.js
index 47d24a8d..a957ca17 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -5,7 +5,6 @@
  * set up a libp2p instance for browser nodes to relay through
  * before tests start
  */
-const path = require('path')
 
 const Libp2p = require('libp2p')
 const PeerId = require('peer-id')
@@ -45,7 +44,7 @@ const before = async () => {
       }
     }
   })
-  
+
   await libp2p.start()
 }
 
@@ -53,20 +52,10 @@ const after = async () => {
   await libp2p.stop()
 }
 
-/** @type {import('aegir').Options["build"]["config"]} */
-const esbuild = {
-  inject: [path.join(__dirname, './scripts/node-globals.js')]
-}
-
 /** @type {import('aegir').PartialOptions} */
 module.exports = {
   test: {
     before,
-    after,
-    browser: {
-      config: {
-        buildConfig: esbuild
-      }
-    }
+    after
   }
 }
diff --git a/package.json b/package.json
index faeb6542..6ffa826f 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
     "@typescript-eslint/parser": "^3.0.2",
     "aegir": "^36.0.2",
     "benchmark": "^2.1.4",
-    "buffer": "^6.0.3",
     "chai": "^4.2.0",
     "chai-spies": "^1.0.0",
     "delay": "^5.0.0",
diff --git a/scripts/node-globals.js b/scripts/node-globals.js
deleted file mode 100644
index 511837b3..00000000
--- a/scripts/node-globals.js
+++ /dev/null
@@ -1 +0,0 @@
-export const { Buffer } = require('buffer')
diff --git a/test/go-gossipsub.js b/test/go-gossipsub.js
index d8778b3d..eff84622 100644
--- a/test/go-gossipsub.js
+++ b/test/go-gossipsub.js
@@ -8,6 +8,8 @@ const errcode = require('err-code')
 const sinon = require('sinon')
 const pRetry = require('p-retry')
 const { EventEmitter } = require('events')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
+const { equals: uint8ArrayEquals } = require('uint8arrays/equals')
 
 const Floodsub = require('libp2p-floodsub')
 const Gossipsub = require('../src')
@@ -41,7 +43,7 @@ const checkReceivedMessage = (topic, data, senderIx, msgIx) =>
       reject(new Error(`Message never received, sender ${senderIx}, receiver ${receiverIx}, index ${msgIx}`))
     }, 20000)
     cb = (msg) => {
-      if (data.equals(msg.data)) {
+      if (uint8ArrayEquals(data, msg.data)) {
         clearTimeout(t)
         psub.off(topic, cb)
         resolve()
@@ -95,7 +97,8 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
+
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -128,7 +131,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -164,7 +167,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
 
       const owner = 0
 
@@ -186,7 +189,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
 
       const owner = 0
 
@@ -227,7 +230,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     let sendRecv = []
     const sendMessages = () => {
       for (let i = 0; i < 100; i++) {
-        const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+        const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
 
         const owner = 0
 
@@ -286,7 +289,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 5; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
 
       const owner = 0
 
@@ -328,7 +331,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     await Promise.all(psubs.map(ps => awaitEvents(ps, 'gossipsub:heartbeat', 2)))
 
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -372,7 +375,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 10; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = 0
       const results = Promise.all(
         group1.slice(1)
@@ -435,7 +438,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -473,7 +476,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -514,7 +517,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * (psubs.length - 5))
       const results = Promise.all(
         psubs.slice(5)
@@ -549,7 +552,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     await Promise.all(psubs.map(ps => awaitEvents(ps, 'gossipsub:heartbeat', 9)))
 
     for (let i = 0; i < 35; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -589,7 +592,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     // create a background flood of messages that overloads the queues
     const floodOwner = Math.floor(Math.random() * psubs.length)
-    const floodMsg = Buffer.from('background flooooood')
+    const floodMsg = uint8ArrayFromString('background flooooood')
     const backgroundFlood = new Promise(async resolve => {
       for (let i = 0; i < 10000; i++) {
         await psubs[floodOwner].publish(floodTopic, floodMsg)
@@ -612,7 +615,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     // and test that we have functional overlays
     let sendRecv = []
     for (let i = 0; i < 5; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -657,7 +660,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 100; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = Math.floor(Math.random() * psubs.length)
       const results = Promise.all(
         psubs
@@ -691,7 +694,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     // wait for heartbeats to build mesh
     await Promise.all(psubs.map(ps => awaitEvents(ps, 'gossipsub:heartbeat', 2)))
 
-    const msg = Buffer.from(`${0} its not a flooooood ${0}`)
+    const msg = uint8ArrayFromString(`${0} its not a flooooood ${0}`)
     const owner = 0
     const results = checkReceivedMessage(topic, msg, owner, 0)(psubs[5], 5)
     await psubs[owner].publish(topic, msg)
@@ -742,7 +745,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (const owner of [9, 3]) {
-      const msg = Buffer.from(`${owner} its not a flooooood ${owner}`)
+      const msg = uint8ArrayFromString(`${owner} its not a flooooood ${owner}`)
       const results = Promise.all(
         psubs
           .filter((psub, j) => j !== owner)
@@ -798,7 +801,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     // send a message from each peer and assert it was propagated
     let sendRecv = []
     for (let i = 0; i < psubs.length; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = i
       const results = Promise.all(
         psubs
@@ -867,7 +870,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 3; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = i
       const results = Promise.all(
         psubs
@@ -888,7 +891,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     sendRecv = []
     for (let i = 0; i < 3; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = i
       const results = Promise.all(
         psubs
@@ -925,7 +928,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     // send messages from the star and assert they were received
     let sendRecv = []
     for (let i = 0; i < 20; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = 0
       const results = Promise.all(
         psubs
@@ -978,7 +981,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     let sendRecv = []
     for (let i = 0; i < 20; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = i
       sendRecv.push(psubs[owner].publish(topic, msg))
     }
@@ -1030,7 +1033,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
 
     psubs[0].on(topic, () => expect.fail('node 0 should not receive any messages'))
 
-    const msg = Buffer.from('its not a flooooood')
+    const msg = uint8ArrayFromString('its not a flooooood')
     await psubs[1].publish(topic, msg)
     await psubs[2].publish(topic, msg)
 
@@ -1139,7 +1142,7 @@ describe("go-libp2p-pubsub gossipsub tests", function () {
     psubs.forEach(ps => ps.subscribe(topic))
 
     for (let i = 0; i < 300; i++) {
-      const msg = Buffer.from(`${i} its not a flooooood ${i}`)
+      const msg = uint8ArrayFromString(`${i} its not a flooooood ${i}`)
       const owner = i % 10
       await psubs[owner].publish(topic, msg)
       await delay(20)
diff --git a/test/gossip.spec.js b/test/gossip.spec.js
index ca8dac31..1090055c 100644
--- a/test/gossip.spec.js
+++ b/test/gossip.spec.js
@@ -1,10 +1,10 @@
 'use strict'
 /* eslint-env mocha */
 
-const { Buffer } = require('buffer')
 const { expect } = require('chai')
 const sinon = require('sinon')
 const delay = require('delay')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const { GossipsubDhi } = require('../src/constants')
 const {
@@ -42,7 +42,7 @@ describe('gossip', () => {
     // set spy
     sinon.spy(nodeA, '_pushGossip')
 
-    await nodeA.publish(topic, Buffer.from('hey'))
+    await nodeA.publish(topic, uint8ArrayFromString('hey'))
 
     await new Promise((resolve) => nodeA.once('gossipsub:heartbeat', resolve))
 
@@ -84,7 +84,7 @@ describe('gossip', () => {
     const graft = { graft: [{ topicID: topic }] }
     nodeA.control.set(peerB, graft)
 
-    await nodeA.publish(topic, Buffer.from('hey'))
+    await nodeA.publish(topic, uint8ArrayFromString('hey'))
 
     expect(nodeA._piggybackControl.callCount).to.be.equal(1)
     // expect control message to be sent alongside published message
diff --git a/test/tracer.spec.js b/test/tracer.spec.js
index 91654e8b..6e152049 100644
--- a/test/tracer.spec.js
+++ b/test/tracer.spec.js
@@ -1,6 +1,6 @@
 const { expect } = require('chai')
 const delay = require('delay')
-const { utils } = require('libp2p-interfaces/src/pubsub')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 const { IWantTracer } = require('../src/tracer')
 const constants = require('../src/constants')
@@ -17,7 +17,7 @@ describe('IWantTracer', () => {
     const msgIds = []
     for (let i = 0; i < 100; i++) {
       const m = makeTestMessage(i)
-      m.from = Buffer.from(peerA)
+      m.from = uint8ArrayFromString(peerA)
       msgIds.push(getMsgId(m))
     }
 
@@ -47,7 +47,7 @@ describe('IWantTracer', () => {
     const msgIds = []
     for (let i = 0; i < 100; i++) {
       const m = makeTestMessage(i)
-      m.from = Buffer.from(peerA)
+      m.from = uint8ArrayFromString(peerA)
       msgs.push(m)
       msgIds.push(getMsgId(m))
     }
diff --git a/test/utils/index.js b/test/utils/index.js
index 90092394..8f0b9a18 100644
--- a/test/utils/index.js
+++ b/test/utils/index.js
@@ -5,6 +5,7 @@ const { expect } = require('chai')
 const FloodSub = require('libp2p-floodsub')
 const PeerId = require('peer-id')
 const delay = require('delay')
+const { fromString: uint8ArrayFromString } = require('uint8arrays/from-string')
 
 exports.first = (map) => map.values().next().value
 
@@ -46,8 +47,8 @@ for (const [k, v] of Object.entries({
 }
 
 exports.getMsgId = (msg) => {
-  const from = Buffer.from(msg.from)
-  const seqno = Buffer.from(msg.seqno)
+  const from = uint8ArrayFromString(msg.from)
+  const seqno = uint8ArrayFromString(msg.seqno)
   const result = new Uint8Array(from.length + seqno.length)
   result.set(from, 0)
   result.set(seqno, from.length)
diff --git a/test/utils/make-test-message.js b/test/utils/make-test-message.js
index 2283bb16..093f3c18 100644
--- a/test/utils/make-test-message.js
+++ b/test/utils/make-test-message.js
@@ -1,7 +1,7 @@
 const makeTestMessage = (i, topicIDs = []) => {
   return {
-    seqno: Buffer.alloc(8, i),
-    data: Buffer.from([i]),
+    seqno: Uint8Array.from(new Array(8).fill(i)),
+    data: Uint8Array.from([i]),
     from: "test",
     topicIDs
   }