diff --git a/packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js b/packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js
index 0f866e8c8a..070be9e4a7 100644
--- a/packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js
+++ b/packages/@vue/cli-plugin-pwa/__tests__/pwaPlugin.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(50000)
 
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js
index 1fbe258728..043e231b5d 100644
--- a/packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js
+++ b/packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js
@@ -1,6 +1,6 @@
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const create = require('@vue/cli-test-utils/createTestProject')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service-global/__tests__/globalService.spec.js b/packages/@vue/cli-service-global/__tests__/globalService.spec.js
index 650e871a3c..08432c50c4 100644
--- a/packages/@vue/cli-service-global/__tests__/globalService.spec.js
+++ b/packages/@vue/cli-service-global/__tests__/globalService.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(40000)
 const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const execa = require('execa')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js b/packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js
index f899c6b06f..cfcc876652 100644
--- a/packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js
+++ b/packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(20000)
 const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const execa = require('execa')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js b/packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js
index d77c462a36..db9f79d579 100644
--- a/packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js
+++ b/packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(20000)
 const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const execa = require('execa')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
 
diff --git a/packages/@vue/cli-service/__tests__/build.spec.js b/packages/@vue/cli-service/__tests__/build.spec.js
index f87ca362f3..070d29a559 100644
--- a/packages/@vue/cli-service/__tests__/build.spec.js
+++ b/packages/@vue/cli-service/__tests__/build.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
 
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service/__tests__/buildLib.spec.js b/packages/@vue/cli-service/__tests__/buildLib.spec.js
index 1acc6940cf..6e8b8e296b 100644
--- a/packages/@vue/cli-service/__tests__/buildLib.spec.js
+++ b/packages/@vue/cli-service/__tests__/buildLib.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(40000)
 
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service/__tests__/buildWc.spec.js b/packages/@vue/cli-service/__tests__/buildWc.spec.js
index d11999d808..b59676d4e7 100644
--- a/packages/@vue/cli-service/__tests__/buildWc.spec.js
+++ b/packages/@vue/cli-service/__tests__/buildWc.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
 
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service/__tests__/buildWcAsync.spec.js b/packages/@vue/cli-service/__tests__/buildWcAsync.spec.js
index 35c4c47a4c..1ea2c74976 100644
--- a/packages/@vue/cli-service/__tests__/buildWcAsync.spec.js
+++ b/packages/@vue/cli-service/__tests__/buildWcAsync.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(15000)
 
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service/__tests__/cors.spec.js b/packages/@vue/cli-service/__tests__/cors.spec.js
index f1942ad350..411cd2d2bd 100644
--- a/packages/@vue/cli-service/__tests__/cors.spec.js
+++ b/packages/@vue/cli-service/__tests__/cors.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(30000)
 
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service/__tests__/modernMode.spec.js b/packages/@vue/cli-service/__tests__/modernMode.spec.js
index 3fcd55c115..56c3b01dd1 100644
--- a/packages/@vue/cli-service/__tests__/modernMode.spec.js
+++ b/packages/@vue/cli-service/__tests__/modernMode.spec.js
@@ -3,7 +3,7 @@ jest.setTimeout(50000)
 const fs = require('fs-extra')
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
diff --git a/packages/@vue/cli-service/__tests__/multiPage.spec.js b/packages/@vue/cli-service/__tests__/multiPage.spec.js
index 975f0d3ae5..54dccf3916 100644
--- a/packages/@vue/cli-service/__tests__/multiPage.spec.js
+++ b/packages/@vue/cli-service/__tests__/multiPage.spec.js
@@ -2,7 +2,7 @@ jest.setTimeout(80000)
 
 const path = require('path')
 const portfinder = require('portfinder')
-const { createServer } = require('http-server')
+const createServer = require('@vue/cli-test-utils/createServer')
 const { defaultPreset } = require('@vue/cli/lib/options')
 const create = require('@vue/cli-test-utils/createTestProject')
 const serve = require('@vue/cli-test-utils/serveWithPuppeteer')
diff --git a/packages/@vue/cli-test-utils/createServer.js b/packages/@vue/cli-test-utils/createServer.js
new file mode 100644
index 0000000000..f7ea494e66
--- /dev/null
+++ b/packages/@vue/cli-test-utils/createServer.js
@@ -0,0 +1,12 @@
+const handler = require('serve-handler')
+const http = require('http')
+
+module.exports = function createServer (options) {
+  const server = http.createServer((request, response) => {
+    return handler(request, response, {
+      public: options.root
+    })
+  })
+
+  return server
+}
diff --git a/packages/@vue/cli-test-utils/package.json b/packages/@vue/cli-test-utils/package.json
index c9e22341b0..d620892076 100644
--- a/packages/@vue/cli-test-utils/package.json
+++ b/packages/@vue/cli-test-utils/package.json
@@ -26,6 +26,7 @@
     "fs-extra": "^7.0.1",
     "json-server": "^0.14.0",
     "puppeteer": "^1.11.0",
+    "serve-handler": "^6.0.1",
     "strip-ansi": "^5.2.0"
   }
 }