diff --git a/mypy/test/testcheck.py b/mypy/test/testcheck.py
index e12004ba91426..6f3b1561474a1 100644
--- a/mypy/test/testcheck.py
+++ b/mypy/test/testcheck.py
@@ -27,9 +27,6 @@
 
 # List of files that contain test case descriptions.
 files = [
-    'check-expressions.test',
-    'check-generic-subtyping.test',
-    'check-varargs.test',
 ]
 fast_parser_files = [
     'check-basic.test',
@@ -73,15 +70,18 @@
     'check-columns.test',
     'check-functions.test',
     'check-tuples.test',
+    'check-expressions.test',
+    'check-generic-subtyping.test',
+    'check-varargs.test',
 ]
 
 files.extend(fast_parser_files)
 
 if 'annotation' in typed_ast.ast35.Assign._fields:
-    files.append('check-newsyntax.test')
+    fast_parser_files.append('check-newsyntax.test')
 
 if 'contains_underscores' in typed_ast.ast35.Num._fields:
-    files.append('check-underscores.test')
+    fast_parser_files.append('check-underscores.test')
 
 
 class TypeCheckSuite(DataSuite):
diff --git a/test-data/unit/check-expressions.test b/test-data/unit/check-expressions.test
index 8b103f62cd785..574c8c379bd85 100644
--- a/test-data/unit/check-expressions.test
+++ b/test-data/unit/check-expressions.test
@@ -895,7 +895,6 @@ main:6: error: "f" does not return a value
 
 [case testNoneReturnTypeWithStatements]
 import typing
-raise f() # Fail
 if f():   # Fail
     pass
 elif f(): # Fail
@@ -904,14 +903,15 @@ while f(): # Fail
     pass
 def g() -> object:
     return f() # Fail
+raise f() # Fail
 
 def f() -> None: pass
 [builtins fixtures/exception.pyi]
 [out]
 main:2: error: "f" does not return a value
-main:3: error: "f" does not return a value
-main:5: error: "f" does not return a value
-main:7: error: "f" does not return a value
+main:4: error: "f" does not return a value
+main:6: error: "f" does not return a value
+main:9: error: "f" does not return a value
 main:10: error: "f" does not return a value
 
 [case testNoneReturnTypeWithExpressions]
diff --git a/test-data/unit/check-generic-subtyping.test b/test-data/unit/check-generic-subtyping.test
index 46df3c9b8cddd..35cd0f99a4ccb 100644
--- a/test-data/unit/check-generic-subtyping.test
+++ b/test-data/unit/check-generic-subtyping.test
@@ -693,8 +693,6 @@ s, s = Nums() # E: Incompatible types in assignment (expression has type "int",
 
 [case testCovariant]
 from typing import TypeVar, Generic
-True = 1
-
 T = TypeVar('T', covariant=True)
 
 class G(Generic[T]): pass
@@ -708,12 +706,11 @@ c = None  # type: G[C]
 
 b = a  # E: Incompatible types in assignment (expression has type G[A], variable has type G[B])
 b = c
+[builtins fixtures/bool.pyi]
 [out]
 
 [case testContravariant]
 from typing import TypeVar, Generic
-True = 1
-
 T = TypeVar('T', contravariant=True)
 
 class G(Generic[T]): pass
@@ -727,12 +724,11 @@ c = None  # type: G[C]
 
 b = a
 b = c  # E: Incompatible types in assignment (expression has type G[C], variable has type G[B])
+[builtins fixtures/bool.pyi]
 [out]
 
 [case testInvariant]
 from typing import TypeVar, Generic
-True = 1
-
 T = TypeVar('T')  # invariant (default)
 
 class G(Generic[T]): pass
@@ -746,4 +742,5 @@ c = None  # type: G[C]
 
 b = a  # E: Incompatible types in assignment (expression has type G[A], variable has type G[B])
 b = c  # E: Incompatible types in assignment (expression has type G[C], variable has type G[B])
+[builtins fixtures/bool.pyi]
 [out]
diff --git a/test-data/unit/check-varargs.test b/test-data/unit/check-varargs.test
index 89120bffe1532..8187ea7805197 100644
--- a/test-data/unit/check-varargs.test
+++ b/test-data/unit/check-varargs.test
@@ -381,7 +381,8 @@ main:4: error: Argument 2 to "f" has incompatible type *List[A]; expected "B"
 main:5: error: Argument 3 to "f" has incompatible type *List[A]; expected "B"
 main:6: error: Argument 1 to "f" has incompatible type *"Tuple[A, A, B]"; expected "B"
 
-[case testVarArgsAfterKeywordArgInCall1]
+[case testVarArgsAfterKeywordArgInCall1-skip]
+# see: mypy issue #2729
 def f(x: int, y: str) -> None: pass
 f(x=1, *[2])
 [builtins fixtures/list.pyi]
@@ -389,7 +390,8 @@ f(x=1, *[2])
 main:2: error: "f" gets multiple values for keyword argument "x"
 main:2: error: Argument 2 to "f" has incompatible type *List[int]; expected "str"
 
-[case testVarArgsAfterKeywordArgInCall2]
+[case testVarArgsAfterKeywordArgInCall2-skip]
+# see: mypy issue #2729
 def f(x: int, y: str) -> None: pass
 f(y='x', *[1])
 [builtins fixtures/list.pyi]