diff --git a/tests/tck/features/match/Base.IntVid.feature b/tests/tck/features/match/Base.IntVid.feature
index 0abbfc75062..20a43766a8f 100644
--- a/tests/tck/features/match/Base.IntVid.feature
+++ b/tests/tck/features/match/Base.IntVid.feature
@@ -514,11 +514,6 @@ Feature: Basic match
       MATCH (v) return v
       """
     Then a ExecutionError should be raised at runtime: Scan vertices or edges need to specify a limit number, or limit number can not push down.
-    When executing query:
-      """
-      MATCH (v:player{name: "Tim Duncan"}) return v
-      """
-    Then a ExecutionError should be raised at runtime: Scan vertices or edges need to specify a limit number, or limit number can not push down.
     When executing query:
       """
       MATCH (v:player:bachelor) RETURN v
diff --git a/tests/tck/features/match/Base.feature b/tests/tck/features/match/Base.feature
index 352f3537016..a74a08d1111 100644
--- a/tests/tck/features/match/Base.feature
+++ b/tests/tck/features/match/Base.feature
@@ -624,11 +624,6 @@ Feature: Basic match
       MATCH (v) return v
       """
     Then a ExecutionError should be raised at runtime: Scan vertices or edges need to specify a limit number, or limit number can not push down.
-    When executing query:
-      """
-      MATCH (v:player{name: "Tim Duncan"}) return v
-      """
-    Then a ExecutionError should be raised at runtime: Scan vertices or edges need to specify a limit number, or limit number can not push down.
     When executing query:
       """
       MATCH (v:player:bachelor) RETURN v
diff --git a/tests/tck/features/match/MatchById.IntVid.feature b/tests/tck/features/match/MatchById.IntVid.feature
index c649353e59a..38ff151f642 100644
--- a/tests/tck/features/match/MatchById.IntVid.feature
+++ b/tests/tck/features/match/MatchById.IntVid.feature
@@ -133,7 +133,7 @@ Feature: Integer Vid Match By Id
       | 'serve' | 'Lakers'    |
     When executing query:
       """
-      MATCH (v1) -[r:serve]-> (v2:player {name: "Cavaliers"})
+      MATCH (v1) -[r:serve]-> (v2:team {name: "Cavaliers"})
       WHERE id(v1) == hash("LeBron James")
       RETURN type(r) AS Type, v2.team.name AS Name
       """
diff --git a/tests/tck/features/match/Scan.feature b/tests/tck/features/match/Scan.feature
index 3937e5ea91c..fc84d2f70f5 100644
--- a/tests/tck/features/match/Scan.feature
+++ b/tests/tck/features/match/Scan.feature
@@ -87,9 +87,8 @@ Feature: Match seek by scan
     Then a ExecutionError should be raised at runtime: Scan vertices or edges need to specify a limit number, or limit number can not push down.
     When executing query:
       """
-      MATCH (v{name: "Mary"})
+      MATCH (v:person)
       RETURN v.student.name AS Name
-      LIMIT 3
       """
     Then a ExecutionError should be raised at runtime: Scan vertices or edges need to specify a limit number, or limit number can not push down.
 
diff --git a/tests/tck/features/match/VariableLengthPattern.feature b/tests/tck/features/match/VariableLengthPattern.feature
index 8d3b26edf05..c3c19133787 100644
--- a/tests/tck/features/match/VariableLengthPattern.feature
+++ b/tests/tck/features/match/VariableLengthPattern.feature
@@ -310,7 +310,7 @@ Feature: Variable length Pattern match (m to n)
   Scenario: multi-steps and filter by node properties
     When executing query:
       """
-      MATCH (v:player{name: 'Tim Duncan'})-[e1:like*1..2]-(v2{name: 'Tony Parker'})-[e2:serve]-(v3{name: 'Spurs'})
+      MATCH (v:player{name: 'Tim Duncan'})-[e1:like*1..2]-(v2:player{name: 'Tony Parker'})-[e2:serve]-(v3:team{name: 'Spurs'})
       RETURN e1, e2
       """
     Then the result should be, in any order, with relax comparison:
diff --git a/tests/tck/features/match/VariableLengthPattern.intVid.feature b/tests/tck/features/match/VariableLengthPattern.intVid.feature
index 70721c32c77..238b5671671 100644
--- a/tests/tck/features/match/VariableLengthPattern.intVid.feature
+++ b/tests/tck/features/match/VariableLengthPattern.intVid.feature
@@ -310,7 +310,7 @@ Feature: Integer Vid Variable length Pattern match (m to n)
   Scenario: Integer Vid  multi-steps and filter by node properties
     When executing query:
       """
-      MATCH (v:player{name: 'Tim Duncan'})-[e1:like*1..2]-(v2{name: 'Tony Parker'})-[e2:serve]-(v3{name: 'Spurs'})
+      MATCH (v:player{name: 'Tim Duncan'})-[e1:like*1..2]-(v2:player{name: 'Tony Parker'})-[e2:serve]-(v3:team{name: 'Spurs'})
       RETURN e1, e2
       """
     Then the result should be, in any order, with relax comparison:
diff --git a/tests/tck/features/yield/parameter.feature b/tests/tck/features/yield/parameter.feature
index 58bd96d71c9..f7688f2d2c5 100644
--- a/tests/tck/features/yield/parameter.feature
+++ b/tests/tck/features/yield/parameter.feature
@@ -61,7 +61,7 @@ Feature: Parameter
       | "Tony Parker"   |
     When executing query:
       """
-      MATCH (v:player)-[:like]->(n{name:$p7.a.b.c})
+      MATCH (v:player)-[:like]->(n:player{name:$p7.a.b.c})
       RETURN n.player.name AS dst LIMIT $p7.a.b.d[0]
       """
     Then the result should be, in any order: