In setupext.py we have a class just for installing the tests -- we should add this as a dependency to that.  That way if the user doesn't install the tests (which may become the default at some time in the future), they wouldn't get mock as a dependency, but if they do, they would.