diff --git a/Tests/AppKit/CPBrowserTest.j b/Tests/AppKit/CPBrowserTest.j
new file mode 100644
index 000000000..2f85c807e
--- /dev/null
+++ b/Tests/AppKit/CPBrowserTest.j
@@ -0,0 +1,94 @@
+@import <AppKit/AppKit.j>
+
+@implementation CPBrowserTest : OJTestCase
+{
+    CPBrowser   browser;
+    CPBrowserDelegate delegate;
+}
+
+- (void)setUp
+{
+    browser = [[CPBrowser alloc] initWithFrame:CGRectMake(0, 0, 500, 300)];
+    delegate = [CPBrowserDelegate new];
+    [delegate setEntries:[".1", ".1.1", ".1.2", ".1.2.1", ".1.2.2", ".2", ".3", ".3.1"]];
+    [browser setDelegate:delegate];
+}
+
+/*!
+    Verify that the items are loaded into rows in their proper columns.
+*/
+- (void)testRows
+{
+    [self assert:".1" equals:[browser itemAtRow:0 inColumn:0]];
+    [self assert:".2" equals:[browser itemAtRow:1 inColumn:0]];
+    [self assert:".3" equals:[browser itemAtRow:2 inColumn:0]];
+
+    // Only one column so far.
+    [self assert:nil equals:[browser itemAtRow:0 inColumn:1]];
+
+    // Drill down.
+    [browser selectRowIndexes:[CPIndexSet indexSetWithIndex:0] inColumn:0];
+    [browser addColumn];
+    [self assert:".1.1" equals:[browser itemAtRow:0 inColumn:1]];
+    [self assert:".1.2" equals:[browser itemAtRow:1 inColumn:1]];
+}
+
+@end
+
+@implementation CPBrowserDelegate : CPObject
+{
+    CPArray entries @accessors;
+}
+
+- (CPArray)childrenOfPrefix:(CPString)theItem
+{
+    if (!theItem)
+        theItem = "";
+
+    var matcher = new RegExp("^" + theItem + "\\.\\d$"),
+        children = [];
+    for (var i = 0; i < entries.length; i++)
+        if (matcher.exec(entries[i]))
+            children.push(entries[i]);
+
+    return children;
+}
+
+- (id)browser:(id)aBrowser numberOfChildrenOfItem:(id)theItem
+{
+    return [[self childrenOfPrefix:theItem] count];
+}
+
+- (id)browser:(id)aBrowser child:(int)theIndex ofItem:(id)theItem
+{
+    return [self childrenOfPrefix:theItem][theIndex];
+}
+
+- (id)browser:(id)aBrowser objectValueForItem:(id)theItem
+{
+    return theItem;
+}
+
+- (id)browser:(id)aBrowser isLeafItem:(id)theItem
+{
+    return ![[self childrenOfPrefix:theItem] count];
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        entries = [aCoder decodeObjectForKey:"entries"];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:entries forKey:"entries"];
+}
+
+@end
\ No newline at end of file