diff --git a/ChangeLog b/ChangeLog
index b768a945b..e4ea747b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Tests/Unit/TestSBJsonParser.m (-test_parseJSONString): input and
+	expected result are embedded in an array since SBJsonParser needs
+	a "container" class.
+	(-test_parseJSONNumber): same as above.
+
 2011-04-01  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentObject.m (-PUTAction:):
diff --git a/Tests/Unit/TestSBJsonParser.m b/Tests/Unit/TestSBJsonParser.m
index 15e94ccca..cb596a645 100644
--- a/Tests/Unit/TestSBJsonParser.m
+++ b/Tests/Unit/TestSBJsonParser.m
@@ -38,7 +38,8 @@
 - (void) test_parseJSONString
 {
   SBJsonParser *parser;
-  NSString *currentString, *expected, *error;
+  NSString *currentString, *error;
+  NSArray *expected;
   NSObject *resultObject;
   int count;
   NSString *testStrings[] = { @"\"\\\\\"", @"\\",
@@ -52,8 +53,10 @@
   count = 0;
   while ((currentString = testStrings[count * 2]))
     {
-      resultObject = [parser objectWithString: currentString];
-      expected = testStrings[count * 2 + 1];
+      resultObject = [parser objectWithString: [NSString stringWithFormat:
+                                                           @"[%@]",
+                                                         currentString]];
+      expected = [NSArray arrayWithObject: testStrings[count * 2 + 1]];
       error = [NSString stringWithFormat:
                           @"objects '%@' and '%@' differs (count: %d)",
                         expected, resultObject, count];
@@ -73,17 +76,17 @@
   result = [parser objectWithString: @""];
   testEquals (result, nil);
 
-  result = [parser objectWithString: @"0"];
-  testEquals (result, [NSNumber numberWithInt: 0]);
+  result = [parser objectWithString: @"[ 0 ]"];
+  testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithInt: 0]]);
                               
-  result = [parser objectWithString: @"-1"];
-  testEquals (result, [NSNumber numberWithInt: -1]);
+  result = [parser objectWithString: @"[ -1 ]"];
+  testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithInt: -1]]);
                               
-  result = [parser objectWithString: @"12.3456"];
-  testEquals (result, [NSNumber numberWithDouble: 12.3456]);
+  result = [parser objectWithString: @"[ 12.3456 ]"];
+  testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithDouble: 12.3456]]);
 
-  result = [parser objectWithString: @"-312.3456"];
-  testEquals (result, [NSNumber numberWithDouble: -312.3456]);
+  result = [parser objectWithString: @"[ -312.3456 ]"];
+  testEquals (result, [NSArray arrayWithObject: [NSNumber numberWithDouble: -312.3456]]);
 }
 
 @end