diff --git a/packages/@vue/cli-plugin-unit-mocha/index.js b/packages/@vue/cli-plugin-unit-mocha/index.js
index cfdec0aa5f..ad1975a684 100644
--- a/packages/@vue/cli-plugin-unit-mocha/index.js
+++ b/packages/@vue/cli-plugin-unit-mocha/index.js
@@ -12,16 +12,18 @@ module.exports = api => {
 
       // when target === 'node', vue-loader will attempt to generate
       // SSR-optimized code. We need to turn that off here.
-      // the `optimizeSSR` option is only available in vue-loader 15
-      if (!isVue3) {
-        webpackConfig.module
+      webpackConfig.module
         .rule('vue')
           .use('vue-loader')
           .tap(options => {
-            options.optimizeSSR = false
+            if (isVue3) {
+              options.isServerBuild = false
+            } else {
+              options.optimizeSSR = false
+            }
+
             return options
           })
-      }
     }
   })
 
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index b684006bd9..ceed3338ca 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -72,7 +72,7 @@
     "thread-loader": "^3.0.0",
     "url-loader": "^4.1.1",
     "vue-loader": "^15.9.2",
-    "vue-loader-v16": "npm:vue-loader@^16.0.0-beta.7",
+    "vue-loader-v16": "npm:vue-loader@^16.1.0",
     "vue-style-loader": "^4.1.2",
     "webpack": "^4.0.0",
     "webpack-bundle-analyzer": "^3.8.0",