diff --git a/tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh b/tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh
index de5926af68d..fee8fca9df7 100644
--- a/tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh
+++ b/tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh
@@ -27,13 +27,17 @@ LINUX_GPU_MAX_WHL_SIZE=390M
 WIN_GPU_MAX_WHL_SIZE=252M
 
 function run_smoke_test() {
-  VENV_TMP_DIR=$(mktemp -d)
 
-  ${PYTHON_BIN_PATH} -m virtualenv -p ${PYTHON_BIN_PATH} "${VENV_TMP_DIR}" || \
-      die "FAILED: Unable to create virtualenv"
+  # Upload the PIP package if whl test passes.
+  if [ ${IN_VENV} -eq 0 ]; then
+    VENV_TMP_DIR=$(mktemp -d)
 
-  source "${VENV_TMP_DIR}/bin/activate" || \
-      die "FAILED: Unable to activate virtualenv "
+    ${PYTHON_BIN_PATH} -m virtualenv -p ${PYTHON_BIN_PATH} "${VENV_TMP_DIR}" || \
+        die "FAILED: Unable to create virtualenv"
+
+    source "${VENV_TMP_DIR}/bin/activate" || \
+        die "FAILED: Unable to activate virtualenv "
+  fi
 
   # install tensorflow
   python -m pip install ${WHL_NAME} || \
@@ -47,9 +51,14 @@ function run_smoke_test() {
   test_tf_whl_size
 
   RESULT=$?
-  # Deactivate from virtualenv.
-  deactivate || source deactivate || die "FAILED: Unable to deactivate from existing virtualenv."
-  sudo rm -rf "${KOKORO_GFILE_DIR}/venv"
+
+  # Upload the PIP package if whl test passes.
+  if [ ${IN_VENV} -eq 0 ]; then
+    # Deactivate from virtualenv.
+    deactivate || source deactivate || die "FAILED: Unable to deactivate from existing virtualenv."
+    sudo rm -rf "${KOKORO_GFILE_DIR}/venv"
+  fi
+
   return $RESULT
 }
 
@@ -133,5 +142,6 @@ if [[ -z "${1}" ]]; then
   return 1
 fi
 
+IN_VENV=$(python -c 'import sys; print("1" if sys.version_info.major == 3 and sys.prefix != sys.base_prefix else "0")')
 WHL_NAME=${1}
 run_smoke_test
diff --git a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh
index c1f241c816d..975aaee187d 100644
--- a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh
+++ b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py36.sh
@@ -49,16 +49,11 @@ done
 # Upload the built packages to pypi.
 for f in $(ls pip_pkg/tf_nightly*dev*macosx*.whl); do
 
-  # deactivate the virtualenv for smoke test
-  deactivate
-
   # test the whl pip package
   chmod +x tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh
   ./tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh ${f}
   RETVAL=$?
 
-  activate_venv_macos
-
   # Upload the PIP package if whl test passes.
   if [ ${RETVAL} -eq 0 ]; then
     echo "Basic PIP test PASSED, Uploading package: ${f}"
diff --git a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh
index 6f4e2ed14bd..3c4d1b051e0 100644
--- a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh
+++ b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py37.sh
@@ -49,16 +49,11 @@ done
 # Upload the built packages to pypi.
 for f in $(ls pip_pkg/tf_nightly*dev*macosx*.whl); do
 
-  # deactivate the virtualenv for smoke test
-  deactivate
-
   # test the whl pip package
   chmod +x tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh
   ./tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh ${f}
   RETVAL=$?
 
-  activate_venv_macos
-
   # Upload the PIP package if whl test passes.
   if [ ${RETVAL} -eq 0 ]; then
     echo "Basic PIP test PASSED, Uploading package: ${f}"
diff --git a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh
index 99923555baf..e2ec3265196 100644
--- a/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh
+++ b/tensorflow/tools/ci_build/nightly_release/macos/cpu_py38.sh
@@ -49,16 +49,11 @@ done
 # Upload the built packages to pypi.
 for f in $(ls pip_pkg/tf_nightly*dev*macosx*.whl); do
 
-  # deactivate the virtualenv for smoke test
-  deactivate
-
   # test the whl pip package
   chmod +x tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh
   ./tensorflow/tools/ci_build/builds/nightly_release_smoke_test.sh ${f}
   RETVAL=$?
 
-  activate_venv_macos
-
   # Upload the PIP package if whl test passes.
   if [ ${RETVAL} -eq 0 ]; then
     echo "Basic PIP test PASSED, Uploading package: ${f}"