diff --git a/reviewboard/scmtools/bzr/__init__.py b/reviewboard/scmtools/bzr/__init__.py
index 990740eb401073f8eb9b4f91181b56b316e8c99d..1b678ece9cde6ba215b0e934cb9bcc5a44416dfd 100644
--- a/reviewboard/scmtools/bzr/__init__.py
+++ b/reviewboard/scmtools/bzr/__init__.py
@@ -340,7 +340,7 @@ class BZRClient(SCMClient):
             reviewboard.scmtools.errors.SCMError:
                 There was an error talking to Bazaar.
         """
-        p = self._run_bzr(['info', self._build_repo_path(self.path)])
+        p = self._run_bzr(['info', self.path])
         errmsg = force_str(p.stderr.read())
         ret_code = p.wait()
 
@@ -434,8 +434,9 @@ class BZRClient(SCMClient):
                 '%s:%s' % (
                     os.path.join(os.path.dirname(__file__), 'plugins',
                                  'bzrlib', 'plugins'),
-                    os.environ.get(str(plugin_path_envvar), str('')))
-            ).encode('utf-8')
+                    os.environ.get(str(plugin_path_envvar), str('')),
+                )
+            ).rstrip(':')
 
         return SCMTool.popen(
             [bzr_exe] + args,
diff --git a/reviewboard/scmtools/tests/test_bazaar.py b/reviewboard/scmtools/tests/test_bazaar.py
index 6d1ea6fa9bfd95314ac86f4244fafbe685719275..3206e3c346c2c07594ce76c066a2afecc653f8a5 100644
--- a/reviewboard/scmtools/tests/test_bazaar.py
+++ b/reviewboard/scmtools/tests/test_bazaar.py
@@ -28,8 +28,8 @@ class BZRTests(SCMTestCase):
     def setUp(self):
         super(BZRTests, self).setUp()
 
-        self.bzr_repo_path = os.path.join(os.path.dirname(__file__),
-                                          '..', 'testdata', 'bzr_repo')
+        self.bzr_repo_path = os.path.abspath(os.path.join(
+            os.path.dirname(__file__), '..', 'testdata', 'bzr_repo'))
         self.bzr_ssh_path = ('bzr+ssh://localhost/%s'
                              % self.bzr_repo_path.replace('\\', '/'))
         self.bzr_sftp_path = ('sftp://localhost/%s'