--- a/components/python/tox/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/python/tox/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -34,9 +34,9 @@
 
 TPNO=			14503
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/setup.py.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/setup.py.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_POST_INSTALL_ACTION += (cd $(PROTO_DIR)/usr/bin ; \
 	$(MV) -f tox tox-$(PYTHON_VERSION); \
@@ -58,6 +58,12 @@
 # Tests require py, pytest and virtualenv packages to be installed.
 test:		$(TEST_NO_ARCH)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += library/python/argparse-26
+REQUIRED_PACKAGES += library/python/py-26
+REQUIRED_PACKAGES += library/python/py-27
+REQUIRED_PACKAGES += library/python/pytest-26
+REQUIRED_PACKAGES += library/python/pytest-27
+REQUIRED_PACKAGES += library/python/setuptools-26
+REQUIRED_PACKAGES += library/python/setuptools-27
+REQUIRED_PACKAGES += library/python/setuptools-34