diff --git a/Tests/AppKit/CPAnimationTest.j b/Tests/AppKit/CPAnimationTest.j
index ef40b7859..85a462d46 100644
--- a/Tests/AppKit/CPAnimationTest.j
+++ b/Tests/AppKit/CPAnimationTest.j
@@ -16,7 +16,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPApplicationTest.j b/Tests/AppKit/CPApplicationTest.j
index 8e1944902..652b73105 100644
--- a/Tests/AppKit/CPApplicationTest.j
+++ b/Tests/AppKit/CPApplicationTest.j
@@ -61,17 +61,11 @@ var globalResults = [];
     CPWindow aWindow;
 }
 
-+ (void)setUp
-{
-    // This will init the global var CPApp which are used internally in the AppKit
-    [[CPApplication alloc] init];
-}
-
 - (void)setUp
 {
     // This sets up the CPApp convenience variable, the unit tests fails
     // if this is not done, because the framework internally uses CPApp.
-    app = [CPApplication sharedApplication];
+    app = [[CPApplication alloc] init];
 
     // fake the window.location.hash
     window.location = {hash: "#var1=1/var2=2"};
diff --git a/Tests/AppKit/CPArrayControllerPerformance.j b/Tests/AppKit/CPArrayControllerPerformance.j
index ad4dac44b..00dd4d21a 100644
--- a/Tests/AppKit/CPArrayControllerPerformance.j
+++ b/Tests/AppKit/CPArrayControllerPerformance.j
@@ -10,7 +10,7 @@ var ELEMENTS = 200,
 
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j
index bb70aef60..ca33da5b8 100644
--- a/Tests/AppKit/CPArrayControllerTest.j
+++ b/Tests/AppKit/CPArrayControllerTest.j
@@ -18,12 +18,6 @@
     CPArray             depValues @accessors;
 }
 
-+ (void)setUp
-{
-    // This will init the global var CPApp which are used internally in the AppKit
-    [[CPApplication alloc] init];
-}
-
 - (CPArray)makeTestArray
 {
     return [[Employee employeeWithName:@"Francisco" department:[Department departmentWithName:@"Cappuccino"]],
@@ -62,6 +56,9 @@
 
 - (void)setUp
 {
+    // This will init the global var CPApp which are used internally in the AppKit
+    [[CPApplication alloc] init];
+
     _contentArray = [self makeTestArray];
     [self initControllerWithSimpleArray]
 }
diff --git a/Tests/AppKit/CPAutosizePerformance.j b/Tests/AppKit/CPAutosizePerformance.j
index b9b75daa3..a6f93bb91 100644
--- a/Tests/AppKit/CPAutosizePerformance.j
+++ b/Tests/AppKit/CPAutosizePerformance.j
@@ -7,14 +7,11 @@
     CPInteger RESIZES_COUNT;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     NUMBER_OF_VIEWS = 50;
     RESIZES_COUNT = 250;
 }
diff --git a/Tests/AppKit/CPBrowserTest.j b/Tests/AppKit/CPBrowserTest.j
index 93d8f5c84..4831b64fa 100644
--- a/Tests/AppKit/CPBrowserTest.j
+++ b/Tests/AppKit/CPBrowserTest.j
@@ -8,14 +8,11 @@
     CPBrowserDelegate delegate;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (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"]];
diff --git a/Tests/AppKit/CPButtonTest.j b/Tests/AppKit/CPButtonTest.j
index 00ba2dd1b..e10550a9e 100644
--- a/Tests/AppKit/CPButtonTest.j
+++ b/Tests/AppKit/CPButtonTest.j
@@ -8,14 +8,11 @@
     BOOL wasClicked;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     button = [CPButton buttonWithTitle:"hello world"];
     wasClicked = NO;
 }
diff --git a/Tests/AppKit/CPCheckBoxTest.j b/Tests/AppKit/CPCheckBoxTest.j
index 6dc5d4bd5..49d83d81f 100644
--- a/Tests/AppKit/CPCheckBoxTest.j
+++ b/Tests/AppKit/CPCheckBoxTest.j
@@ -4,7 +4,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPCollectionViewTest.j b/Tests/AppKit/CPCollectionViewTest.j
index c8d69aa6a..2f73fd9e7 100644
--- a/Tests/AppKit/CPCollectionViewTest.j
+++ b/Tests/AppKit/CPCollectionViewTest.j
@@ -7,14 +7,11 @@
     id _globalResults;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _collectionView = [[CPCollectionView alloc] initWithFrame:CGRectMakeZero()];
     _globalResults = nil;
 }
diff --git a/Tests/AppKit/CPColorTest.j b/Tests/AppKit/CPColorTest.j
index a63f89aac..27b7e1709 100644
--- a/Tests/AppKit/CPColorTest.j
+++ b/Tests/AppKit/CPColorTest.j
@@ -4,7 +4,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPColorWellTest.j b/Tests/AppKit/CPColorWellTest.j
index ddaf11921..b870ce4ff 100644
--- a/Tests/AppKit/CPColorWellTest.j
+++ b/Tests/AppKit/CPColorWellTest.j
@@ -6,14 +6,11 @@
     CPColorWell colorWell;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     colorWell = [[CPColorWell alloc] initWithFrame:CGRectMakeZero()];
 }
 
diff --git a/Tests/AppKit/CPComboBoxTest.j b/Tests/AppKit/CPComboBoxTest.j
index 875e2cf90..09d3617be 100644
--- a/Tests/AppKit/CPComboBoxTest.j
+++ b/Tests/AppKit/CPComboBoxTest.j
@@ -10,14 +10,11 @@
     BOOL       wasClicked
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     comboBox = [[CPComboBox alloc] initWithFrame:CGRectMake(0, 0, 200, 30)];
 }
 
diff --git a/Tests/AppKit/CPDOMDisplayServerTest.j b/Tests/AppKit/CPDOMDisplayServerTest.j
index 147d240e7..6d8be8e31 100644
--- a/Tests/AppKit/CPDOMDisplayServerTest.j
+++ b/Tests/AppKit/CPDOMDisplayServerTest.j
@@ -8,14 +8,11 @@
     BOOL     aTransform;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     // set up a dummy DOM element.
     DOMElement = {
         style: {
diff --git a/Tests/AppKit/CPDatePickerTest.j b/Tests/AppKit/CPDatePickerTest.j
index 79af6033e..6d21db25c 100644
--- a/Tests/AppKit/CPDatePickerTest.j
+++ b/Tests/AppKit/CPDatePickerTest.j
@@ -10,14 +10,11 @@
     CPDatePicker datePicker;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     datePicker = [[CPDatePicker alloc] initWithFrame:CGRectMake(200, 28, 0, 0)];
 }
 
diff --git a/Tests/AppKit/CPEventTest.j b/Tests/AppKit/CPEventTest.j
index 46706d1ab..7570583dc 100644
--- a/Tests/AppKit/CPEventTest.j
+++ b/Tests/AppKit/CPEventTest.j
@@ -5,7 +5,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPFontManagerTest.j b/Tests/AppKit/CPFontManagerTest.j
index c6cbdc5e7..43173afca 100644
--- a/Tests/AppKit/CPFontManagerTest.j
+++ b/Tests/AppKit/CPFontManagerTest.j
@@ -10,14 +10,11 @@
     int tag @accessors;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     fontA = [CPFont systemFontOfSize:8.0];
 }
 
diff --git a/Tests/AppKit/CPFontTest.j b/Tests/AppKit/CPFontTest.j
index 70d3fd9fc..ace991a5a 100644
--- a/Tests/AppKit/CPFontTest.j
+++ b/Tests/AppKit/CPFontTest.j
@@ -9,14 +9,11 @@
     CPFont _boldCustomFont;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _systemFont = [CPFont systemFontOfSize:15];
     _boldSystemFont = [CPFont boldSystemFontOfSize:15];
 
diff --git a/Tests/AppKit/CPImageTest.j b/Tests/AppKit/CPImageTest.j
index c639c712f..324eac73c 100644
--- a/Tests/AppKit/CPImageTest.j
+++ b/Tests/AppKit/CPImageTest.j
@@ -4,7 +4,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPKeyEquivalentPerformance.j b/Tests/AppKit/CPKeyEquivalentPerformance.j
index bc1a5ebf2..699c029fc 100644
--- a/Tests/AppKit/CPKeyEquivalentPerformance.j
+++ b/Tests/AppKit/CPKeyEquivalentPerformance.j
@@ -8,7 +8,7 @@
 
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j b/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j
index d5f6010e2..4b282d83a 100644
--- a/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j
+++ b/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j
@@ -18,14 +18,11 @@
     CPObjectController  objectController @accessors;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     track = [Track new];
     [track setVolume:5.0];
 }
diff --git a/Tests/AppKit/CPKeyValueBindingTest.j b/Tests/AppKit/CPKeyValueBindingTest.j
index 97de7ee33..373f696a3 100644
--- a/Tests/AppKit/CPKeyValueBindingTest.j
+++ b/Tests/AppKit/CPKeyValueBindingTest.j
@@ -21,7 +21,7 @@
     CPArrayController   arrayController @accessors;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPLevelIndicatorTest.j b/Tests/AppKit/CPLevelIndicatorTest.j
index e6d200286..08a84967d 100644
--- a/Tests/AppKit/CPLevelIndicatorTest.j
+++ b/Tests/AppKit/CPLevelIndicatorTest.j
@@ -7,7 +7,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPMenuTest.j b/Tests/AppKit/CPMenuTest.j
index 3e377ae20..6449b65aa 100644
--- a/Tests/AppKit/CPMenuTest.j
+++ b/Tests/AppKit/CPMenuTest.j
@@ -17,14 +17,11 @@
     CPMenuItem anInstantiatedMenuItem;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     // Set up a fairly complete menu to have something to work with.
     menu = [[CPMenu alloc] initWithTitle:@"MainMenu"];
 
diff --git a/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j b/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j
index 0d7716211..30a79082d 100644
--- a/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j
+++ b/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j
@@ -9,14 +9,11 @@ var CPMenuValidatedUserInterfaceItemTestValidatedItems = [];
     MenuTarget                      _menuTarget @accessors(property=menuTarget);
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _menuTarget = [[MenuTarget alloc] init];
     [[CPApplication sharedApplication] setDelegate:_menuTarget];
 
diff --git a/Tests/AppKit/CPOutlineViewTest.j b/Tests/AppKit/CPOutlineViewTest.j
index 38ba86ef2..881be24e1 100644
--- a/Tests/AppKit/CPOutlineViewTest.j
+++ b/Tests/AppKit/CPOutlineViewTest.j
@@ -9,14 +9,11 @@
     TestOutlineDataSource  dataSource;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     outlineView = [[CPOutlineView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
 
     tableColumn = [[CPTableColumn alloc] initWithIdentifier:@"Foo"];
diff --git a/Tests/AppKit/CPPasteboardTest.j b/Tests/AppKit/CPPasteboardTest.j
index d6d5b5596..b209eb998 100644
--- a/Tests/AppKit/CPPasteboardTest.j
+++ b/Tests/AppKit/CPPasteboardTest.j
@@ -6,7 +6,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPPopUpButtonTest.j b/Tests/AppKit/CPPopUpButtonTest.j
index fd74197cf..a66ec0088 100644
--- a/Tests/AppKit/CPPopUpButtonTest.j
+++ b/Tests/AppKit/CPPopUpButtonTest.j
@@ -9,14 +9,11 @@
     id objects @accessors;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     button = [CPPopUpButton new];
 }
 
diff --git a/Tests/AppKit/CPPredicateEditorTest.j b/Tests/AppKit/CPPredicateEditorTest.j
index db8869a62..32f040cc5 100644
--- a/Tests/AppKit/CPPredicateEditorTest.j
+++ b/Tests/AppKit/CPPredicateEditorTest.j
@@ -6,14 +6,11 @@
     CPPredicateEditor _editor;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _editor = [[CPPredicateEditor alloc] initWithFrame:CGRectMakeZero()];
 }
 
diff --git a/Tests/AppKit/CPResponderTest.j b/Tests/AppKit/CPResponderTest.j
index 861d63d17..4c3159ab3 100644
--- a/Tests/AppKit/CPResponderTest.j
+++ b/Tests/AppKit/CPResponderTest.j
@@ -10,14 +10,11 @@
     CPResponder responder;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     responder = [TestResponder new];
     responder.doCommandCalls = [];
 }
diff --git a/Tests/AppKit/CPScrollViewTest.j b/Tests/AppKit/CPScrollViewTest.j
index d3e58f1a0..5bcaad4b4 100644
--- a/Tests/AppKit/CPScrollViewTest.j
+++ b/Tests/AppKit/CPScrollViewTest.j
@@ -7,7 +7,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPSearchFieldTest.j b/Tests/AppKit/CPSearchFieldTest.j
index 60a0d7536..64ea85047 100644
--- a/Tests/AppKit/CPSearchFieldTest.j
+++ b/Tests/AppKit/CPSearchFieldTest.j
@@ -5,14 +5,11 @@
     CPSearchField _searchField;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _searchField = [[CPSearchField alloc] initWithFrame:CGRectMakeZero()];
 }
 
diff --git a/Tests/AppKit/CPSegmentedControlTest.j b/Tests/AppKit/CPSegmentedControlTest.j
index bf846be11..0ec784363 100644
--- a/Tests/AppKit/CPSegmentedControlTest.j
+++ b/Tests/AppKit/CPSegmentedControlTest.j
@@ -6,14 +6,11 @@
     CPSegmentedControl _segmentedControl;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _segmentedControl = [[CPSegmentedControl alloc] initWithFrame:CGRectMakeZero()];
     [_segmentedControl setSegmentCount:3];
 }
diff --git a/Tests/AppKit/CPSliderTest.j b/Tests/AppKit/CPSliderTest.j
index 724378263..0f045d117 100644
--- a/Tests/AppKit/CPSliderTest.j
+++ b/Tests/AppKit/CPSliderTest.j
@@ -4,7 +4,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPSplitViewTest.j b/Tests/AppKit/CPSplitViewTest.j
index 977d47e00..a3326f053 100644
--- a/Tests/AppKit/CPSplitViewTest.j
+++ b/Tests/AppKit/CPSplitViewTest.j
@@ -8,14 +8,11 @@
     CPView viewB;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     splitView = [[CPSplitView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
     viewA = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 100, 50)];
     viewB = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 100, 50)];
diff --git a/Tests/AppKit/CPStepperTest.j b/Tests/AppKit/CPStepperTest.j
index 37cbe3098..825af8f69 100644
--- a/Tests/AppKit/CPStepperTest.j
+++ b/Tests/AppKit/CPStepperTest.j
@@ -6,14 +6,11 @@
     CPStepper stepper;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     stepper = [CPStepper stepper];
     [stepper setValueWraps:NO];
 }
diff --git a/Tests/AppKit/CPTabViewTest.j b/Tests/AppKit/CPTabViewTest.j
index 9c86436d9..d0599435b 100644
--- a/Tests/AppKit/CPTabViewTest.j
+++ b/Tests/AppKit/CPTabViewTest.j
@@ -23,14 +23,11 @@
     CPTabViewItem   _tabItem2;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _tabView = [[CPTabView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)];
 
     _tabItem1 = [[CPTabViewItem alloc] initWithIdentifier:@"id1"];
diff --git a/Tests/AppKit/CPTableViewReloadDataTest.j b/Tests/AppKit/CPTableViewReloadDataTest.j
index c6cacddee..751baa687 100644
--- a/Tests/AppKit/CPTableViewReloadDataTest.j
+++ b/Tests/AppKit/CPTableViewReloadDataTest.j
@@ -7,14 +7,11 @@
     CPArray         tableContent;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     tableContent = [];
     // setup a reasonable table
     theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0)
diff --git a/Tests/AppKit/CPTableViewTableColumnTest.j b/Tests/AppKit/CPTableViewTableColumnTest.j
index bad588c1d..b3817c605 100644
--- a/Tests/AppKit/CPTableViewTableColumnTest.j
+++ b/Tests/AppKit/CPTableViewTableColumnTest.j
@@ -6,14 +6,11 @@
     CPTableView     tableView;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     // setup a reasonable table
     theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0)
                                             styleMask:CPWindowNotSizable];
diff --git a/Tests/AppKit/CPTableViewTest.j b/Tests/AppKit/CPTableViewTest.j
index bd6a0799f..561906603 100644
--- a/Tests/AppKit/CPTableViewTest.j
+++ b/Tests/AppKit/CPTableViewTest.j
@@ -13,14 +13,11 @@
     int             selectionDidChangeNotificationsReceived;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     // setup a reasonable table
     theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0) styleMask:CPWindowNotSizable];
 
diff --git a/Tests/AppKit/CPTextFieldTest.j b/Tests/AppKit/CPTextFieldTest.j
index c00934230..6de3510c4 100644
--- a/Tests/AppKit/CPTextFieldTest.j
+++ b/Tests/AppKit/CPTextFieldTest.j
@@ -5,7 +5,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPThemeTest.j b/Tests/AppKit/CPThemeTest.j
index 37942b3be..e6fc1494c 100644
--- a/Tests/AppKit/CPThemeTest.j
+++ b/Tests/AppKit/CPThemeTest.j
@@ -4,7 +4,7 @@
 {
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
diff --git a/Tests/AppKit/CPTokenFieldTest.j b/Tests/AppKit/CPTokenFieldTest.j
index a046ed1af..7b9be7051 100644
--- a/Tests/AppKit/CPTokenFieldTest.j
+++ b/Tests/AppKit/CPTokenFieldTest.j
@@ -10,14 +10,11 @@
 
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0)
                                              styleMask:CPWindowNotSizable];
 
diff --git a/Tests/AppKit/CPTreeNodeTest.j b/Tests/AppKit/CPTreeNodeTest.j
index c53c3d6f8..4e40b5f98 100644
--- a/Tests/AppKit/CPTreeNodeTest.j
+++ b/Tests/AppKit/CPTreeNodeTest.j
@@ -6,14 +6,11 @@
     CPTreeNode childNode;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     treeNode = [CPTreeNode treeNodeWithRepresentedObject:nil];
 
     childNode = [CPTreeNode treeNodeWithRepresentedObject:nil];
diff --git a/Tests/AppKit/CPViewTest.j b/Tests/AppKit/CPViewTest.j
index 3f73a614d..5c2457569 100644
--- a/Tests/AppKit/CPViewTest.j
+++ b/Tests/AppKit/CPViewTest.j
@@ -13,14 +13,11 @@ var methodCalled;
     CPWindow window;
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     window = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1000.0, 1000.0) styleMask:CPWindowNotSizable];
 
     view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
diff --git a/Tests/AppKit/CPWindowTest.j b/Tests/AppKit/CPWindowTest.j
index 6b635d930..b3a7d2ba0 100644
--- a/Tests/AppKit/CPWindowTest.j
+++ b/Tests/AppKit/CPWindowTest.j
@@ -7,14 +7,11 @@
     CPWindow                _window @accessors(property=window);
 }
 
-+ (void)setUp
+- (void)setUp
 {
     // This will init the global var CPApp which are used internally in the AppKit
     [[CPApplication alloc] init];
-}
 
-- (void)setUp
-{
     _window = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0)
                                           styleMask:CPWindowNotSizable];
 }