diff --git a/src/strtest.cc b/src/strtest.cc
index 149f6742d..81083ec76 100644
--- a/src/strtest.cc
+++ b/src/strtest.cc
@@ -16,7 +16,7 @@ static const char source[] = __FILE__;
 
 #define equal(p, s)     (mstring(p) == mstring(s))
 
-#define expect(u, s)    if (++testsrun, (u) == mstring(s) && equal(u, s)) \
+#define expect(u, s)    if (++testsrun, mstring(s).equals(u) && equal(u, s)) \
         ++passed; else test_failed(u, s, __LINE__)
 
 // XXX: those argument ordering and purpose := strange.
diff --git a/src/yicon.cc b/src/yicon.cc
index 185284a79..9229b3b8e 100644
--- a/src/yicon.cc
+++ b/src/yicon.cc
@@ -27,7 +27,7 @@ YIcon::YIcon(upath filename) :
         loadedH(false), fCached(false), fPath(filename.expand())
 {
     // don't attempt to load if icon is disabled
-    if (fPath == "none" || fPath == "-")
+    if (fPath.equals("none") || fPath.equals("-"))
         loadedS = loadedL = loadedH = true;
 }