diff --git a/Tests/Manual/CPPopUpButtonTest/AppController.j b/Tests/Manual/CPPopUpButtonTest/AppController.j
index 0161f26bf..44b6124d4 100644
--- a/Tests/Manual/CPPopUpButtonTest/AppController.j
+++ b/Tests/Manual/CPPopUpButtonTest/AppController.j
@@ -25,11 +25,11 @@
 
     for (var i = 0; i < 5; i++)
     {
-        var menuItem1 = [[CPMenuItem alloc] initWithTitle:[CPString stringWithFormat:@"%i", i] action:nil keyEquivalent:nil];
+        var menuItem1 = [[CPMenuItem alloc] initWithTitle:[CPString stringWithFormat:@"Left %i", i] action:nil keyEquivalent:nil];
         [menuItem1 setTag:i];
         [popUpButton addItem:menuItem1];
 
-        var menuItem2 = [[CPMenuItem alloc] initWithTitle:[CPString stringWithFormat:@"%i", i] action:nil keyEquivalent:nil];
+        var menuItem2 = [[CPMenuItem alloc] initWithTitle:[CPString stringWithFormat:@"Right %i", i] action:nil keyEquivalent:nil];
         [menuItem2 setTag:i];
         [popUpButton2 addItem:menuItem2];
     }
@@ -37,12 +37,15 @@
     [popUpButton sizeToFit];
     [popUpButton2 sizeToFit];
 
+    var width = CGRectGetWidth([popUpButton frame]),
+        width2 = CGRectGetWidth([popUpButton2 frame]);
+
     [popUpButton setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin | CPViewMinYMargin | CPViewMaxYMargin];
-    [popUpButton setCenter:CGPointMake([contentView center].x - 25.0, [contentView center].y)];
+    [popUpButton setCenter:CGPointMake([contentView center].x - width / 2.0 - 10, [contentView center].y)];
     [contentView addSubview:popUpButton];
 
     [popUpButton2 setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin | CPViewMinYMargin | CPViewMaxYMargin];
-    [popUpButton2 setCenter:CGPointMake([contentView center].x + 25.0, [contentView center].y)];
+    [popUpButton2 setCenter:CGPointMake([contentView center].x + width / 2.0 + 10, [contentView center].y)];
     [contentView addSubview:popUpButton2];
 
     var textField = [[CPTextField alloc] initWithFrame:CGRectMake(0.0, 0.0, 200.0, 29.0)],