diff --git a/libs/pbd/run-tests.sh b/libs/pbd/run-tests.sh
index b1315312bc..c20dc42adc 100755
--- a/libs/pbd/run-tests.sh
+++ b/libs/pbd/run-tests.sh
@@ -6,7 +6,7 @@ if [ ! -f './id.cc' ]; then
 fi
 
 srcdir=`pwd`
-cd ../../build/default
+cd ../../build
 
 libs='libs'
 
diff --git a/libs/pbd/test/convert_test.cc b/libs/pbd/test/convert_test.cc
new file mode 100644
index 0000000000..43e6546716
--- /dev/null
+++ b/libs/pbd/test/convert_test.cc
@@ -0,0 +1,14 @@
+#include "convert_test.h"
+#include "pbd/convert.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION (ConvertTest);
+
+using namespace std;
+
+void
+ConvertTest::testUrlDecode ()
+{
+	string url = "http://foo.bar.baz/A%20B%20C%20.html";
+	PBD::url_decode (url);
+	CPPUNIT_ASSERT_EQUAL (url, string ("http://foo.bar.baz/A B C .html"));
+}
diff --git a/libs/pbd/test/xpath.cc b/libs/pbd/test/xpath.cc
index d06bf81c29..15062c6132 100644
--- a/libs/pbd/test/xpath.cc
+++ b/libs/pbd/test/xpath.cc
@@ -8,7 +8,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION (XPathTest);
 
 using namespace std;
 
-static string const prefix = "../../libs/pbd/test/";
+static string const prefix = "../libs/pbd/test/";
 
 void
 XPathTest::testMisc ()
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 8afc89ea87..b050544524 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -136,6 +136,7 @@ def build(bld):
                 test/xpath.cc
                 test/scalar_properties.cc
                 test/signals_test.cc
+                test/convert_test.cc
         '''.split()
         testobj.target       = 'run-tests'
         testobj.includes     = obj.includes + ['test', '../pbd']