diff --git a/src/tests/kits/support/bstring/StringAccessTest.cpp b/src/tests/kits/support/bstring/StringAccessTest.cpp
index e3b9ab809c..a63830ea3a 100644
--- a/src/tests/kits/support/bstring/StringAccessTest.cpp
+++ b/src/tests/kits/support/bstring/StringAccessTest.cpp
@@ -22,12 +22,12 @@ StringAccessTest::PerformTest(void)
 	NextSubTest();
 	BString string("Something"B_UTF8_ELLIPSIS);
 	CPPUNIT_ASSERT(string.CountChars() == 10);
-	CPPUNIT_ASSERT(string.Length() == strlen(string.String());
+	CPPUNIT_ASSERT(string.Length() == strlen(string.String()));
 
 	NextSubTest();
 	BString string2("ABCD");
 	CPPUNIT_ASSERT(string2.CountChars() == 4);
-	CPPUNIT_ASSERT(string2.Length() == strlen(string2.String());
+	CPPUNIT_ASSERT(string2.Length() == strlen(string2.String()));
 
 	NextSubTest();
 	static char s[64];
@@ -35,11 +35,11 @@ StringAccessTest::PerformTest(void)
 	strcat(s, B_UTF8_SMILING_FACE);
 	BString string3(s);
 	CPPUNIT_ASSERT(string3.CountChars() == 2);	
-	CPPUNIT_ASSERT(string3.Length() == strlen(string3.String());
+	CPPUNIT_ASSERT(string3.Length() == strlen(string3.String()));
 
 	NextSubTest();
 	BString empty;
-	CPPUNIT_ASSERT(empty.String() == NULL);
+	CPPUNIT_ASSERT(strcmp(empty.String(), "") == 0);
 	CPPUNIT_ASSERT(empty.Length() == 0);
 	CPPUNIT_ASSERT(empty.CountChars() == 0);