diff --git a/pip/ipython.file b/pip/ipython.file
index 54e145777ad..27a6b1f6a76 100644
--- a/pip/ipython.file
+++ b/pip/ipython.file
@@ -1,3 +1,2 @@
 Requires: py2-traitlets py2-pickleshare py2-Pygments py2-prompt_toolkit py2-pexpect py2-simplegeneric py2-backports
-%define RelocatePython %{i}/bin/*
-%define RelocatePython3 %{i}/bin/*3
+%define PipPostBuildPy3 rm -f %{i}/bin/iptest %{i}/bin/ipython
diff --git a/pip/jupyter_console.file b/pip/jupyter_console.file
index 74a86a42d6b..fa49f64bb2c 100644
--- a/pip/jupyter_console.file
+++ b/pip/jupyter_console.file
@@ -1,2 +1,2 @@
 Requires: py2-ipykernel
-%define RelocatePython %{i}/bin/jupyter-console
+%define PipPostBuildPy3 mv %{i}/bin/jupyter-console %{i}/bin/jupyter-console3
diff --git a/pip/notebook.file b/pip/notebook.file
index 6bdc085f2aa..363d959a4e9 100644
--- a/pip/notebook.file
+++ b/pip/notebook.file
@@ -1,2 +1,2 @@
 Requires: py2-terminado py2-nbconvert py2-ipykernel py2-Send2Trash py2-ipaddress py2-prometheus_client
-%define RelocatePython %{i}/bin/*
+%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/numpy.file b/pip/numpy.file
index af9c6e3ed6a..9804ed91700 100644
--- a/pip/numpy.file
+++ b/pip/numpy.file
@@ -29,3 +29,5 @@ EOF
   %{relocateConfig}lib/python*/site-packages/numpy/__config__.py \
   %{relocateConfig}lib/python*/site-packages/numpy/distutils/__config__.py \
   %{relocateConfig}lib/python*/site-packages/numpy/distutils/site.cfg
+
+%define PipPostBuildPy3 rm -f %{i}/bin/f2py
diff --git a/pip/py2-tensorflow.file b/pip/py2-tensorflow.file
index e329150eff2..6db484c6d32 100644
--- a/pip/py2-tensorflow.file
+++ b/pip/py2-tensorflow.file
@@ -1,4 +1,4 @@
 Requires: py2-enum34 py2-tensorboard
 BuildRequires: tensorflow-sources
 %define PipPreBuildPy2 PIPFILE=${TENSORFLOW_SOURCES_ROOT}/tensorflow-%{realversion}-cp27-cp27mu-linux_%{_arch}.whl
-%define PipPostBuild ls %{i}/bin/* | xargs -i cp '{}' '{}2'
+%define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i cp '{}' '{}2'
diff --git a/pip/py3-tensorflow.file b/pip/py3-tensorflow.file
index 7beeeab3a72..d4ddeff010c 100644
--- a/pip/py3-tensorflow.file
+++ b/pip/py3-tensorflow.file
@@ -1,4 +1,4 @@
 BuildRequires: tensorflow-python3-sources
 Requires: py3-tensorboard
 %define PipPreBuildPy3 PIPFILE=${TENSORFLOW_PYTHON3_SOURCES_ROOT}/tensorflow-%{realversion}-cp36-cp36m-linux_%{_arch}.whl
-%define PipPostBuild ls %{i}/bin/* | xargs -i mv '{}' '{}3'
+%define PipPostBuild rm -f %{i}/bin/tensorboard* ; ls %{i}/bin/* | xargs -i mv '{}' '{}3'
diff --git a/pip/pylint.file b/pip/pylint.file
index cd577699b7a..2a4100dc7e1 100644
--- a/pip/pylint.file
+++ b/pip/pylint.file
@@ -1,3 +1,2 @@
 Requires: py2-astroid py2-six py2-isort py2-mccabe py2-configparser
-%define RelocatePython %{i}/bin/*
 %define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done
diff --git a/pip/pytest.file b/pip/pytest.file
index d05036ee204..75d494fa2b0 100644
--- a/pip/pytest.file
+++ b/pip/pytest.file
@@ -1,3 +1,3 @@
 Requires: py2-more-itertools py2-atomicwrites py2-attrs py2-funcsigs py2-pathlib2 py2-pluggy py2-py py2-scandir
 Requires: py2-packaging py2-wcwidth
-%define RelocatePython %{i}/bin/*
+%define PipPostBuildPy3 for x in $(ls %{i}/bin/*) ; do mv $x ${x}3; done