diff --git a/enginetest/evaluation.go b/enginetest/evaluation.go
index 719ee0abe3..4b8ae12dfc 100644
--- a/enginetest/evaluation.go
+++ b/enginetest/evaluation.go
@@ -301,6 +301,10 @@ func TestTransactionScriptWithEngine(t *testing.T, e QueryEngine, harness Harnes
 				t.Skip()
 			}
 
+			if assertion.Skip {
+				t.Skip()
+			}
+
 			if assertion.ExpectedErr != nil {
 				AssertErrWithCtx(t, e, harness, clientSession, assertion.Query, assertion.Bindings, assertion.ExpectedErr)
 			} else if assertion.ExpectedErrStr != "" {
diff --git a/sql/analyzer/rule_ids.go b/sql/analyzer/rule_ids.go
index 1aaa06e936..1d20e7498b 100644
--- a/sql/analyzer/rule_ids.go
+++ b/sql/analyzer/rule_ids.go
@@ -6,25 +6,25 @@ type RuleId int
 
 const (
 	// once before
-	applyDefaultSelectLimitId RuleId = iota // applyDefaultSelectLimit
-	validateOffsetAndLimitId                // validateOffsetAndLimit
-	validateStarExpressionsId               // validateStarExpressions
-	ValidateCreateTableId                   // validateCreateTable
-	validateAlterTableId                    // validateAlterTable
-	validateExprSemId                       // validateExprSem
-	loadStoredProceduresId                  // loadStoredProcedures
-	validateDropTablesId                    // validateDropTables
-	resolveDropConstraintId                 // resolveDropConstraint
-	validateDropConstraintId                // validateDropConstraint
-	resolveCreateSelectId                   // resolveCreateSelect
-	resolveSubqueriesId                     // resolveSubqueries
-	resolveUnionsId                         // resolveUnions
-	ValidateColumnDefaultsId                // validateColumnDefaults
-	validateCreateTriggerId                 // validateCreateTrigger
-	validateReadOnlyDatabaseId              // validateReadOnlyDatabase
-	validateReadOnlyTransactionId           // validateReadOnlyTransaction
-	validateDatabaseSetId                   // validateDatabaseSet
-	validatePrivilegesId                    // validatePrivileges
+	applyDefaultSelectLimitId     RuleId = iota // applyDefaultSelectLimit
+	validateOffsetAndLimitId                    // validateOffsetAndLimit
+	validateStarExpressionsId                   // validateStarExpressions
+	ValidateCreateTableId                       // validateCreateTable
+	validateAlterTableId                        // validateAlterTable
+	validateExprSemId                           // validateExprSem
+	loadStoredProceduresId                      // loadStoredProcedures
+	validateDropTablesId                        // validateDropTables
+	resolveDropConstraintId                     // resolveDropConstraint
+	validateDropConstraintId                    // validateDropConstraint
+	resolveCreateSelectId                       // resolveCreateSelect
+	resolveSubqueriesId                         // resolveSubqueries
+	resolveUnionsId                             // resolveUnions
+	ValidateColumnDefaultsId                    // validateColumnDefaults
+	validateCreateTriggerId                     // validateCreateTrigger
+	validateReadOnlyDatabaseId                  // validateReadOnlyDatabase
+	validateReadOnlyTransactionId               // validateReadOnlyTransaction
+	validateDatabaseSetId                       // validateDatabaseSet
+	validatePrivilegesId                        // validatePrivileges
 
 	// default
 	flattenTableAliasesId          // flattenTableAliases