diff --git a/packages/@vue/cli-service/lib/__mocks__/mock-config.js b/packages/@vue/cli-service/__mocks__/mock-config.js
similarity index 100%
rename from packages/@vue/cli-service/lib/__mocks__/mock-config.js
rename to packages/@vue/cli-service/__mocks__/mock-config.js
diff --git a/packages/@vue/cli-service/lib/__mocks__/vue-cli-plugin-foo.js b/packages/@vue/cli-service/__mocks__/vue-cli-plugin-foo.js
similarity index 100%
rename from packages/@vue/cli-service/lib/__mocks__/vue-cli-plugin-foo.js
rename to packages/@vue/cli-service/__mocks__/vue-cli-plugin-foo.js
diff --git a/packages/@vue/cli-service/lib/__tests__/.eslintrc b/packages/@vue/cli-service/__tests__/.eslintrc
similarity index 100%
rename from packages/@vue/cli-service/lib/__tests__/.eslintrc
rename to packages/@vue/cli-service/__tests__/.eslintrc
diff --git a/packages/@vue/cli-service/lib/__tests__/Service.spec.js b/packages/@vue/cli-service/__tests__/Service.spec.js
similarity index 99%
rename from packages/@vue/cli-service/lib/__tests__/Service.spec.js
rename to packages/@vue/cli-service/__tests__/Service.spec.js
index 387b1ee93..049024f10 100644
--- a/packages/@vue/cli-service/lib/__tests__/Service.spec.js
+++ b/packages/@vue/cli-service/__tests__/Service.spec.js
@@ -4,7 +4,7 @@ jest.mock('vue-cli-plugin-foo')
 
 const fs = require('fs')
 const path = require('path')
-const Service = require('../Service')
+const Service = require('../lib/Service')
 
 const mockPkg = json => {
   fs.writeFileSync('/package.json', JSON.stringify(json, null, 2))
diff --git a/packages/@vue/cli-service/lib/__tests__/build.spec.js b/packages/@vue/cli-service/__tests__/build.spec.js
similarity index 100%
rename from packages/@vue/cli-service/lib/__tests__/build.spec.js
rename to packages/@vue/cli-service/__tests__/build.spec.js
diff --git a/packages/@vue/cli-service/lib/__tests__/serve.spec.js b/packages/@vue/cli-service/__tests__/serve.spec.js
similarity index 100%
rename from packages/@vue/cli-service/lib/__tests__/serve.spec.js
rename to packages/@vue/cli-service/__tests__/serve.spec.js
diff --git a/packages/@vue/cli/lib/__tests__/Creator.spec.js b/packages/@vue/cli/__tests__/Creator.spec.js
similarity index 97%
rename from packages/@vue/cli/lib/__tests__/Creator.spec.js
rename to packages/@vue/cli/__tests__/Creator.spec.js
index 5820a1c70..d5ffe67ff 100644
--- a/packages/@vue/cli/lib/__tests__/Creator.spec.js
+++ b/packages/@vue/cli/__tests__/Creator.spec.js
@@ -1,7 +1,7 @@
 jest.mock('fs')
 jest.mock('inquirer')
 
-const { defaults } = require('../options')
+const { defaults } = require('../lib/options')
 const assertPromptModule = require('@vue/cli-test-utils/assertPromptModule')
 
 test('default', async () => {
diff --git a/packages/@vue/cli/lib/__tests__/Generator.spec.js b/packages/@vue/cli/__tests__/Generator.spec.js
similarity index 99%
rename from packages/@vue/cli/lib/__tests__/Generator.spec.js
rename to packages/@vue/cli/__tests__/Generator.spec.js
index b62b47d9e..a442ce490 100644
--- a/packages/@vue/cli/lib/__tests__/Generator.spec.js
+++ b/packages/@vue/cli/__tests__/Generator.spec.js
@@ -2,7 +2,7 @@ jest.mock('fs')
 
 const fs = require('fs')
 const path = require('path')
-const Generator = require('../Generator')
+const Generator = require('../lib/Generator')
 const { logs } = require('@vue/cli-shared-utils')
 
 // prepare template fixtures
diff --git a/packages/@vue/cli/lib/__tests__/options.spec.js b/packages/@vue/cli/__tests__/options.spec.js
similarity index 97%
rename from packages/@vue/cli/lib/__tests__/options.spec.js
rename to packages/@vue/cli/__tests__/options.spec.js
index 01f098058..94be7438c 100644
--- a/packages/@vue/cli/lib/__tests__/options.spec.js
+++ b/packages/@vue/cli/__tests__/options.spec.js
@@ -5,7 +5,7 @@ const {
   rcPath,
   loadOptions,
   saveOptions
-} = require('../options')
+} = require('../lib/options')
 
 test('load options', () => {
   expect(loadOptions()).toEqual({})