diff --git a/sdk/servicebus/service-bus/package.json b/sdk/servicebus/service-bus/package.json
index ade5f19fd4f6..821efce124ca 100644
--- a/sdk/servicebus/service-bus/package.json
+++ b/sdk/servicebus/service-bus/package.json
@@ -108,9 +108,9 @@
     "build:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1",
     "build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
     "build:samples": "node .scripts/prepSamples.js && cd samples && tsc -p .",
-    "build:test:browser": "tsc -p . && cross-env BROWSER_TEST=true rollup -c 2>&1",
-    "build:test:node": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
-    "build:test": "tsc -p . && cross-env ONLY_NODE=true rollup -c rollup.test.config.js 2>&1",
+    "build:test:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c rollup.test.config.js 2>&1",
+    "build:test:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c rollup.test.config.js 2>&1",
+    "build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
     "build": "tsc -p . && rollup -c 2>&1 && npm run extract-api",
     "check-format": "prettier --list-different --config ../../.prettierrc.json \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
     "clean": "rimraf dist dist-esm test-dist typings *.tgz *.log coverage coverage-browser .nyc_output",
diff --git a/sdk/servicebus/service-bus/rollup.config.js b/sdk/servicebus/service-bus/rollup.config.js
index 0561cc0a3c26..aa60e18807db 100644
--- a/sdk/servicebus/service-bus/rollup.config.js
+++ b/sdk/servicebus/service-bus/rollup.config.js
@@ -14,8 +14,4 @@ if (!process.env.ONLY_NODE) {
   inputs.push(base.browserConfig({ production: true }));
 }
 
-if (process.env.BROWSER_TEST) {
-  inputs.push(base.browserConfig({ test: true }));
-}
-
 export default inputs;
diff --git a/sdk/servicebus/service-bus/rollup.test.config.js b/sdk/servicebus/service-bus/rollup.test.config.js
index 2ab7beeef5eb..48ea762bf9e0 100644
--- a/sdk/servicebus/service-bus/rollup.test.config.js
+++ b/sdk/servicebus/service-bus/rollup.test.config.js
@@ -3,4 +3,14 @@
 
 import * as base from "./rollup.base.config";
 
-export default [base.nodeConfig({ test: true }) /*, base.browserConfig({ test: true })*/];
+const inputs = [];
+
+if (!process.env.ONLY_BROWSER) {
+  inputs.push(base.nodeConfig({ test: true }));
+}
+
+if (!process.env.ONLY_NODE) {
+  inputs.push(base.browserConfig({ test: true }));
+}
+
+export default inputs;