diff --git a/package.json b/package.json
index e4639e6274..69deee38ef 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "expose-loader": "^0.7.3",
     "form-data": "^2.3.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "~0.33.1",
+    "interface-ipfs-core": "~0.33.2",
     "ipfsd-ctl": "~0.24.0",
     "left-pad": "^1.1.3",
     "lodash": "^4.17.4",
@@ -105,13 +105,13 @@
     "hapi-set-header": "^1.0.2",
     "hoek": "^5.0.2",
     "ipfs-api": "^15.0.1",
-    "ipfs-bitswap": "~0.17.2",
+    "ipfs-bitswap": "~0.17.4",
     "ipfs-block": "~0.6.1",
     "ipfs-block-service": "~0.13.0",
     "ipfs-multipart": "~0.1.0",
     "ipfs-repo": "~0.18.3",
     "ipfs-unixfs": "~0.1.14",
-    "ipfs-unixfs-engine": "~0.23.0",
+    "ipfs-unixfs-engine": "~0.23.1",
     "ipld-resolver": "~0.14.1",
     "is-ipfs": "^0.3.2",
     "is-stream": "^1.1.0",
@@ -119,7 +119,7 @@
     "libp2p": "~0.13.0",
     "libp2p-circuit": "~0.1.4",
     "libp2p-floodsub": "~0.11.1",
-    "libp2p-kad-dht": "~0.5.1",
+    "libp2p-kad-dht": "~0.6.0",
     "libp2p-mdns": "~0.9.1",
     "libp2p-multiplex": "~0.5.0",
     "libp2p-railing": "~0.7.1",
@@ -140,7 +140,7 @@
     "path-exists": "^3.0.0",
     "peer-book": "~0.5.1",
     "peer-id": "~0.10.2",
-    "peer-info": "~0.11.0",
+    "peer-info": "~0.11.1",
     "progress": "^2.0.0",
     "promisify-es6": "^1.0.3",
     "pull-abortable": "^4.1.1",
diff --git a/test/core/bitswap.spec.js b/test/core/bitswap.spec.js
index 9c6341636e..a92a604ec3 100644
--- a/test/core/bitswap.spec.js
+++ b/test/core/bitswap.spec.js
@@ -39,7 +39,7 @@ describe('bitswap', () => {
   let inProcNode // Node spawned inside this process
 
   beforeEach(function (done) {
-    this.timeout(15 * 1000)
+    this.timeout(30 * 1000)
 
     let config = {
       repo: createTempRepo(),
@@ -71,7 +71,7 @@ describe('bitswap', () => {
   })
 
   afterEach(function (done) {
-    this.timeout(15 * 1000)
+    this.timeout(30 * 1000)
 
     inProcNode.stop(() => done())
   })
@@ -141,7 +141,7 @@ describe('bitswap', () => {
       })
 
       it('3 peers', function (done) {
-        this.timeout(20 * 1000)
+        this.timeout(30 * 1000)
 
         let blocks
         const remoteNodes = []
diff --git a/test/core/circuit-relay.spec.js b/test/core/circuit-relay.spec.js
index 2068eec4a8..65c08179fe 100644
--- a/test/core/circuit-relay.spec.js
+++ b/test/core/circuit-relay.spec.js
@@ -29,7 +29,7 @@ function peerInfoFromObj (obj, callback) {
 }
 
 describe('circuit', function () {
-  this.timeout(20 * 1000)
+  this.timeout(40 * 1000)
 
   let factory
 
@@ -44,7 +44,9 @@ describe('circuit', function () {
   // let nodeId1
   let nodeId2
 
-  before((done) => {
+  before(function (done) {
+    this.timeout(40 * 1000)
+
     factory = new IPFSFactory()
 
     const base = {
diff --git a/test/core/create-node.spec.js b/test/core/create-node.spec.js
index 0719fd8eac..2906bb93df 100644
--- a/test/core/create-node.spec.js
+++ b/test/core/create-node.spec.js
@@ -14,10 +14,10 @@ const IPFS = require('../../src/core')
 // This gets replaced by `create-repo-browser.js` in the browser
 const createTempRepo = require('../utils/create-repo-nodejs.js')
 
-describe('create node', () => {
-  it('custom repoPath', function (done) {
-    this.timeout(15 * 1000)
+describe('create node', function () {
+  this.timeout(30 * 1000)
 
+  it('custom repoPath', function (done) {
     const node = new IPFS({
       repo: '/tmp/ipfs-repo-' + Math.random(),
       config: {
@@ -41,8 +41,6 @@ describe('create node', () => {
   })
 
   it('custom repo', function (done) {
-    this.timeout(15 * 1000)
-
     const node = new IPFS({
       repo: createTempRepo(),
       config: {
@@ -65,7 +63,6 @@ describe('create node', () => {
   })
 
   it('IPFS.createNode', function (done) {
-    this.timeout(15 * 1000)
     const node = IPFS.createNode({
       repo: createTempRepo(),
       config: {
@@ -160,7 +157,6 @@ describe('create node', () => {
   })
 
   it('init: true, start: false', function (done) {
-    this.timeout(20 * 1000)
     const node = new IPFS({
       repo: createTempRepo(),
       init: true,
@@ -181,8 +177,6 @@ describe('create node', () => {
   })
 
   it('init: true, start: false, use callback', function (done) {
-    this.timeout(20 * 1000)
-
     const node = new IPFS({
       repo: createTempRepo(),
       init: true,
@@ -232,8 +226,6 @@ describe('create node', () => {
   })
 
   it('start and stop, start and stop', function (done) {
-    this.timeout(15 * 1000)
-
     const node = new IPFS({
       repo: createTempRepo(),
       config: {
@@ -253,8 +245,6 @@ describe('create node', () => {
   })
 
   it('can start node twice without crash', function (done) {
-    this.timeout(15 * 1000)
-
     const options = {
       repo: createTempRepo(),
       config: {
diff --git a/test/core/files-sharding.spec.js b/test/core/files-sharding.spec.js
index 588281b3c4..8476486961 100644
--- a/test/core/files-sharding.spec.js
+++ b/test/core/files-sharding.spec.js
@@ -41,7 +41,7 @@ describe('files dir', () => {
     after((done) => ipfs.stop(done))
 
     it('should be able to add dir without sharding', function (done) {
-      this.timeout(15 * 1000)
+      this.timeout(30 * 1000)
 
       pull(
         pull.values(files),
@@ -65,7 +65,7 @@ describe('files dir', () => {
     let ipfs
 
     before(function (done) {
-      this.timeout(15 * 1000)
+      this.timeout(30 * 1000)
 
       ipfs = new IPFS({
         repo: createTempRepo(),
@@ -85,7 +85,7 @@ describe('files dir', () => {
     after((done) => ipfs.stop(done))
 
     it('should be able to add dir with sharding', function (done) {
-      this.timeout(15 * 1000)
+      this.timeout(30 * 1000)
 
       pull(
         pull.values(files),