diff --git a/tensorboard/pip_package/build_pip_package.sh b/tensorboard/pip_package/build_pip_package.sh
index c7e20d5468..b9296e5a6e 100755
--- a/tensorboard/pip_package/build_pip_package.sh
+++ b/tensorboard/pip_package/build_pip_package.sh
@@ -141,6 +141,7 @@ smoke() {
 
   if [ -n "${smoke_tf}" ]; then
     pip install -qU "${smoke_tf}"
+    pip uninstall -qy tensorboard tb-nightly  # Drop any conflicting packages
   fi
   pip install -qU ../dist/*"py${py_major_version}"*.whl >/dev/null
   pip freeze  # Log the results of pip installation