diff --git a/package.json b/package.json
index 757af33d02..8b0ff2d786 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "boom": "^7.2.0",
     "bs58": "^4.0.1",
     "byteman": "^1.3.5",
+    "ci-info": "^2.0.0",
     "cid-tool": "~0.2.0",
     "cids": "~0.5.5",
     "class-is": "^1.1.0",
diff --git a/src/core/config.js b/src/core/config.js
index acad9d877f..d03ea0cdf8 100644
--- a/src/core/config.js
+++ b/src/core/config.js
@@ -9,7 +9,7 @@ const schema = Joi.object().keys({
   ).allow(null),
   repoOwner: Joi.boolean().default(true),
   preload: Joi.object().keys({
-    enabled: Joi.boolean().default(true),
+    enabled: Joi.boolean(),
     addresses: Joi.array().items(Joi.multiaddr().options({ convert: false })),
     interval: Joi.number().integer().default(30 * 1000)
   }).allow(null),
diff --git a/src/core/index.js b/src/core/index.js
index 496396a443..873da33d11 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -14,6 +14,7 @@ const CID = require('cids')
 const debug = require('debug')
 const defaultsDeep = require('@nodeutils/defaults-deep')
 const EventEmitter = require('events')
+const { isCI } = require('ci-info')
 
 const config = require('./config')
 const boot = require('./boot')
@@ -67,7 +68,7 @@ class IPFS extends EventEmitter {
       start: true,
       EXPERIMENTAL: {},
       preload: {
-        enabled: true,
+        enabled: !(isCI || process.env.NODE_ENV === 'test'),
         addresses: [
           '/dnsaddr/node0.preload.ipfs.io/https',
           '/dnsaddr/node1.preload.ipfs.io/https'
diff --git a/src/core/preload.js b/src/core/preload.js
index 2902005fc2..e139d31790 100644
--- a/src/core/preload.js
+++ b/src/core/preload.js
@@ -18,6 +18,7 @@ module.exports = self => {
   options.addresses = options.addresses || []
 
   if (!options.enabled || !options.addresses.length) {
+    log('preload disabled')
     const api = (_, callback) => {
       if (callback) {
         setImmediate(() => callback())