diff --git a/.aegir.js b/.aegir.js
index bbe8a75e9..51aedf024 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -12,7 +12,7 @@ module.exports = {
   },
   karma: {
     files: [{
-      pattern: 'node_modules/interface-ipfs-core/js/test/fixtures/**/*',
+      pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
       watched: false,
       served: true,
       included: false
diff --git a/package.json b/package.json
index a16e7896e..a14884b08 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "dirty-chai": "^2.0.1",
     "eslint-plugin-react": "^7.11.1",
     "go-ipfs-dep": "~0.4.18",
-    "interface-ipfs-core": "~0.96.0",
+    "interface-ipfs-core": "~0.98.0",
     "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl",
     "nock": "^10.0.2",
     "pull-stream": "^3.6.9",
diff --git a/src/pubsub.js b/src/pubsub.js
index f539d0e3a..6b298351d 100644
--- a/src/pubsub.js
+++ b/src/pubsub.js
@@ -77,7 +77,11 @@ module.exports = (arg) => {
         return setImmediate(() => callback(err))
       }
 
-      ps.removeListener(topic, handler)
+      if (!handler && !callback) {
+        ps.removeAllListeners(topic)
+      } else {
+        ps.removeListener(topic, handler)
+      }
 
       // Drop the request once we are actually done
       if (ps.listenerCount(topic) === 0) {
diff --git a/test/get.spec.js b/test/get.spec.js
index c789ce971..2c5adb6d9 100644
--- a/test/get.spec.js
+++ b/test/get.spec.js
@@ -23,7 +23,7 @@ describe('.get (specific go-ipfs features)', function () {
 
   const smallFile = {
     cid: 'Qma4hjFTnCasJ8PVp3mZbZK5g2vGDT4LByLJ7m8ciyRFZP',
-    data: fixture('js/test/fixtures/testfile.txt')
+    data: fixture('test/fixtures/testfile.txt')
   }
 
   let ipfsd