diff --git a/tests/language/language.status b/tests/language/language.status
index b6e45aff0a0..58e0ce0cf46 100644
--- a/tests/language/language.status
+++ b/tests/language/language.status
@@ -7,11 +7,12 @@
 
 # In order to maintain maximum test coverage for all builds,
 # please use the following procedure to mark a test
-# failed on an architecture other than the one you are working on.
+# failed on architectures other than the one you are working on.
 #
 # 1) Copy the old version of the test to
-#    tests/language/src/TestName[Dartc|VM]Test.dart.
-# 2) File a bug for the failure due to the language change.
+#    tests/language/src/TestName[Dartc|VM|Frog]Test.dart.
+#    to maintain coverage.
+# 2) File a bug on each archtiecture for the failure due to the language change.
 # 3) Update the language/src directory with the updated test.
 
 prefix language
@@ -48,8 +49,12 @@ WrongNumberTypeArgumentsTest: Fail # Bug 5532690
 Prefix18NegativeTest: Fail # Issue 307
 Prefix20NegativeTest: Fail # Issue 307
 
-# DartC specific tests that should not be run by the VM.
+# DartC or Frog specific tests that should not be run by the VM
 *DartcTest: Skip
+*DartcNegativeTest: Skip
+*FrogTest: Skip
+*FrogNegativeTest: Skip
+
 
 [ $component == vm && $mode == debug ]
 NonParameterizedFactoryTest: Crash  # Issue 226
@@ -164,8 +169,11 @@ BlackListedTest/12: Fail # Bug 5469684
 BlackListedTest/13: Crash # Bug 5469684
 BlackListedTest/14: Crash # Bug 5469684
 
-# VM specific tests that should not be run by DartC.
+# VM or Frog specific tests that should not be run by DartC.
 *VMTest: Skip
+*VMNegativeTest: Skip
+*FrogTest: Skip
+*FrogNegativeTest: Skip
 
 
 [ $component == dartium ]
diff --git a/tools/presubmit.sh b/tools/presubmit.sh
index 6adaf572cf8..3836c7e28f8 100755
--- a/tools/presubmit.sh
+++ b/tools/presubmit.sh
@@ -90,8 +90,6 @@ echo
 echo "--- Building debug ---"
 doBuild ia32 debug
 
-
-
 echo
 echo "=== Runtime tests === "
 echo " Debug (Ctrl-C to skip this set of tests)"
@@ -105,20 +103,30 @@ fi
 
 
 echo
-echo "=== Compiler tests ==="
+echo "=== dartc tests ==="
 echo " Debug mode (Ctrl-C to skip this set of tests)"
 doTest compiler dartc debug
-COMPILER_RESULT=$?
+DARTC_RESULT=$?
 
 if [ ${DO_OPTIMIZE} == 1 ] ; then
   echo " Release mode (--optimize)"
   doTest compiler dartc release
   RESULT=$?
   if [ ${RESULT} != 0 ] ; then
-    COMPILER_RESULT=${RESULT}
+    DARTC_RESULT=${RESULT}
   fi
 fi
 
+echo
+echo "=== frog tests ==="
+cd frog 
+./presubmit.py
+FROG_RESULT=$?
+if [ ${FROG_RESULT} != 0 ] ; then
+  TESTS_FAILED=1
+fi
+cd -
+
 echo
 echo "=== Client tests ==="
 echo " Chromium  (Ctrl-C to skip this set of tests)"
@@ -145,15 +153,19 @@ fi
 
 # Print summary of results
 if [ ${RUNTIME_RESULT}  != 0 ] ; then
-  echo "*** Runtime tests failed"
+  echo "*** vm tests failed"
 fi
 
-if [ ${COMPILER_RESULT}  != 0 ] ; then
-  echo "*** Compiler tests failed"
+if [ ${DARTC_RESULT}  != 0 ] ; then
+  echo "*** dartc tests failed"
+fi
+
+if [ ${FROG_RESULT}  != 0 ] ; then
+  echo "*** frog tests failed"
 fi
 
 if [ ${CLIENT_RESULT}  != 0 ] ; then
-  echo "*** Client tests failed"
+  echo "*** client tests failed"
 fi
 
 if [ ${TESTS_FAILED} == 0 ] ; then