diff --git a/Tests/AppKit/CGContextTest.j b/Tests/AppKit/CGContextTest.j
index 0ed6242e6..8b4499825 100644
--- a/Tests/AppKit/CGContextTest.j
+++ b/Tests/AppKit/CGContextTest.j
@@ -8,12 +8,18 @@
     /*
       Ensure that we have no canvas nor vml support.
     */
-    [self assert:YES equals:!CPFeatureIsCompatible(CPHTMLCanvasFeature)];
+    if (system.engine !== "jsc")
+    {
+        [self assert:YES equals:!CPFeatureIsCompatible(CPHTMLCanvasFeature)];
+    }
     [self assert:YES equals:!CPFeatureIsCompatible(CPVMLFeature)];
 }
 
 - (void)testGStateCreate
 {
+    if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
+        return;
+
     var gstate = CGGStateCreate(),
         testdata = { alpha:       1.0,
                      strokeStyle: "#000",
@@ -41,6 +47,9 @@
 
 - (void)testGStateCreateCopy
 {
+    if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
+        return;
+
     var gstate = CGGStateCreate(),
         gstatecopy = CGGStateCreateCopy(gstate),
         testdata = { alpha:       1.0,
diff --git a/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j b/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j
index 4322239fa..e60c456db 100644
--- a/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j
+++ b/Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j
@@ -43,7 +43,7 @@ var CPMenuValidatedUserInterfaceItemTestValidatedItems = [];
     var parentItem = [[self menu] itemWithTitle:@"parent"];
 
     [self assertTrue:[parentItem isEnabled] message:@"Parent items should never be disabled"];
-    [self assertFalse:[[[self menuTarget] validatedItems] containsObject:parent] message:@"Parent items should never be validated"];
+    [self assertFalse:[[[self menuTarget] validatedItems] containsObject:parentItem] message:@"Parent items should never be validated"];
 }
 
 @end
diff --git a/Tools/Scripts/ci.sh b/Tools/Scripts/ci.sh
index 045c90d63..bb89cc298 100755
--- a/Tools/Scripts/ci.sh
+++ b/Tools/Scripts/ci.sh
@@ -7,7 +7,7 @@ export PATH="$HOME/narwhal/bin:$PATH"
 export CAPP_AUTO_UPGRADE="yes"
 
 export CAPP_BUILD="$project_home/build_incremental"
-time jake test
+time jake CommonJS test-only
 code=$?
 if [ $code -ne 0 ]; then
     echo "INCREMENTAL BUILD FAILED ($code)"
@@ -19,7 +19,7 @@ fi
 export CAPP_BUILD="$project_home/build_clean"
 rm -rf "$CAPP_BUILD"
 
-time jake CommonJS test
+time jake CommonJS test-only
 code=$?
 if [ $code -ne 0 ]; then
     echo "CLEAN BUILD FAILED ($code)"