-GET_PIP_SCRIPT=$(VPP_PYTHON_PREFIX)/get-pip.py
-PIP_INSTALL_DONE=$(VPP_PYTHON_PREFIX)/pip-install.done
-PIP_PATCH_DONE=$(VPP_PYTHON_PREFIX)/pip-patch.done
-PAPI_INSTALL_DONE=$(VPP_PYTHON_PREFIX)/papi-install.done
+ifeq ($(TEST_DEBUG),1)
+TEST_RUN_DIR:=$(VENV_PATH)/run-debug
+PYTHON_EXTRA_DEPENDS=objgraph pympler
+else
+TEST_RUN_DIR:=$(VENV_PATH)/run
+PYTHON_EXTRA_DEPENDS=
+endif
+
+PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) -r requirements.txt
+SCAPY_SOURCE=$(shell find $(VENV_PATH) -name site-packages)
+BUILD_COV_DIR=$(TEST_DIR)/coverage
+
+GET_PIP_SCRIPT=$(TEST_RUN_DIR)/get-pip.py
+PIP_INSTALL_DONE=$(TEST_RUN_DIR)/pip-install.done
+PIP_PATCH_DONE=$(TEST_RUN_DIR)/pip-patch.done
+PAPI_INSTALL_DONE=$(TEST_RUN_DIR)/papi-install.done