ImportError running selftest -s bp.search in bzr.dev

Running bzr selftest -s bp.search with bzr.dev fails with the following error:

bzr: ERROR: exceptions.ImportError: cannot import name TestLoader

Traceback (most recent call last):
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/commands.py", line 912, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/commands.py", line 1112, in run_bzr
    ret = run(*run_argv)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/commands.py", line 690, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/commands.py", line 705, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/builtins.py", line 3623, in run
    result = tests.selftest(**selftest_kwargs)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/tests/__init__.py", line 3469, in selftest
    suite = test_suite(keep_only, starting_with)
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/tests/__init__.py", line 3943, in test_suite
    plugin_suite = plugin.test_suite()
  File "/home/garyvdm/bzr/bzr.dev/bzrlib/plugin.py", line 506, in test_suite
    return self.module.test_suite()
  File "/home/garyvdm/.bazaar/plugins/search/__init__.py", line 84, in test_suite
    from bzrlib.tests import TestLoader
ImportError: cannot import name TestLoader

This is a regression from bzr 2.2.