diff --git a/go/testplans/test_retry.pb.go b/go/testplans/test_retry.pb.go
index eab3c05..6313337 100644
--- a/go/testplans/test_retry.pb.go
+++ b/go/testplans/test_retry.pb.go
@@ -26,11 +26,13 @@
 	// Tag defines which suite this config set should apply.
 	TestSuite string `protobuf:"bytes,1,opt,name=test_suite,json=testSuite,proto3" json:"test_suite,omitempty"`
 	// Scenarios to retry for each build_target.
-	SuiteScenarios       []*SuiteRetryCfg_Scenario        `protobuf:"bytes,3,rep,name=suite_scenarios,json=suiteScenarios,proto3" json:"suite_scenarios,omitempty"`
-	BuilderScenarios     []*SuiteRetryCfg_BuilderScenario `protobuf:"bytes,4,rep,name=builder_scenarios,json=builderScenarios,proto3" json:"builder_scenarios,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                         `json:"-"`
-	XXX_unrecognized     []byte                           `json:"-"`
-	XXX_sizecache        int32                            `json:"-"`
+	SuiteScenarios   []*SuiteRetryCfg_Scenario        `protobuf:"bytes,3,rep,name=suite_scenarios,json=suiteScenarios,proto3" json:"suite_scenarios,omitempty"`
+	BuilderScenarios []*SuiteRetryCfg_BuilderScenario `protobuf:"bytes,4,rep,name=builder_scenarios,json=builderScenarios,proto3" json:"builder_scenarios,omitempty"`
+	// ReasonScenarios to retry for the suite.
+	ReasonScenarios      []*SuiteRetryCfg_ReasonScenario `protobuf:"bytes,5,rep,name=reason_scenarios,json=reasonScenarios,proto3" json:"reason_scenarios,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                        `json:"-"`
+	XXX_unrecognized     []byte                          `json:"-"`
+	XXX_sizecache        int32                           `json:"-"`
 }
 
 func (m *SuiteRetryCfg) Reset()         { *m = SuiteRetryCfg{} }
@@ -79,6 +81,13 @@
 	return nil
 }
 
+func (m *SuiteRetryCfg) GetReasonScenarios() []*SuiteRetryCfg_ReasonScenario {
+	if m != nil {
+		return m.ReasonScenarios
+	}
+	return nil
+}
+
 // Scenario defines the test failure conditions that trigger retry.
 type SuiteRetryCfg_Scenario struct {
 	// Name of the test.
@@ -196,36 +205,99 @@
 	return nil
 }
 
+// Reason scenario defines test failure conditions irrespective of which test.
+type SuiteRetryCfg_ReasonScenario struct {
+	// Failures reason.
+	Reason string `protobuf:"bytes,1,opt,name=reason,proto3" json:"reason,omitempty"`
+	// Verdict of the test run.
+	Verdict test_platform.TaskState_Verdict `protobuf:"varint,2,opt,name=verdict,proto3,enum=test_platform.TaskState_Verdict" json:"verdict,omitempty"`
+	// Should the DUT/VM restart before retry?
+	RequiresRestart      bool     `protobuf:"varint,3,opt,name=requires_restart,json=requiresRestart,proto3" json:"requires_restart,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *SuiteRetryCfg_ReasonScenario) Reset()         { *m = SuiteRetryCfg_ReasonScenario{} }
+func (m *SuiteRetryCfg_ReasonScenario) String() string { return proto.CompactTextString(m) }
+func (*SuiteRetryCfg_ReasonScenario) ProtoMessage()    {}
+func (*SuiteRetryCfg_ReasonScenario) Descriptor() ([]byte, []int) {
+	return fileDescriptor_5e1b8044c4eb67ff, []int{0, 2}
+}
+
+func (m *SuiteRetryCfg_ReasonScenario) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SuiteRetryCfg_ReasonScenario.Unmarshal(m, b)
+}
+func (m *SuiteRetryCfg_ReasonScenario) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SuiteRetryCfg_ReasonScenario.Marshal(b, m, deterministic)
+}
+func (m *SuiteRetryCfg_ReasonScenario) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SuiteRetryCfg_ReasonScenario.Merge(m, src)
+}
+func (m *SuiteRetryCfg_ReasonScenario) XXX_Size() int {
+	return xxx_messageInfo_SuiteRetryCfg_ReasonScenario.Size(m)
+}
+func (m *SuiteRetryCfg_ReasonScenario) XXX_DiscardUnknown() {
+	xxx_messageInfo_SuiteRetryCfg_ReasonScenario.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SuiteRetryCfg_ReasonScenario proto.InternalMessageInfo
+
+func (m *SuiteRetryCfg_ReasonScenario) GetReason() string {
+	if m != nil {
+		return m.Reason
+	}
+	return ""
+}
+
+func (m *SuiteRetryCfg_ReasonScenario) GetVerdict() test_platform.TaskState_Verdict {
+	if m != nil {
+		return m.Verdict
+	}
+	return test_platform.TaskState_VERDICT_UNSPECIFIED
+}
+
+func (m *SuiteRetryCfg_ReasonScenario) GetRequiresRestart() bool {
+	if m != nil {
+		return m.RequiresRestart
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterType((*SuiteRetryCfg)(nil), "testplans.SuiteRetryCfg")
 	proto.RegisterType((*SuiteRetryCfg_Scenario)(nil), "testplans.SuiteRetryCfg.Scenario")
 	proto.RegisterType((*SuiteRetryCfg_BuilderScenario)(nil), "testplans.SuiteRetryCfg.BuilderScenario")
+	proto.RegisterType((*SuiteRetryCfg_ReasonScenario)(nil), "testplans.SuiteRetryCfg.ReasonScenario")
 }
 
 func init() { proto.RegisterFile("testplans/test_retry.proto", fileDescriptor_5e1b8044c4eb67ff) }
 
 var fileDescriptor_5e1b8044c4eb67ff = []byte{
-	// 351 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x4a, 0xeb, 0x40,
-	0x14, 0x25, 0x4d, 0xe9, 0x4b, 0xef, 0xe3, 0xb5, 0x7d, 0xb3, 0x90, 0x10, 0x29, 0x44, 0x57, 0x71,
-	0x33, 0x81, 0x16, 0x37, 0x6e, 0x84, 0xba, 0x73, 0xe1, 0x22, 0x55, 0x17, 0x6e, 0xc2, 0xb4, 0x9d,
-	0xc6, 0xd0, 0x26, 0x53, 0xef, 0x9d, 0x08, 0xfe, 0x90, 0x1f, 0xe7, 0x57, 0x48, 0x26, 0x9d, 0xd4,
-	0x0a, 0x82, 0xbb, 0x9c, 0x73, 0xcf, 0x39, 0xb9, 0xf7, 0x30, 0x10, 0x68, 0x49, 0x7a, 0xb7, 0x15,
-	0x25, 0xc5, 0xf5, 0x57, 0x8a, 0x52, 0xe3, 0x1b, 0xdf, 0xa1, 0xd2, 0x8a, 0xf5, 0xdb, 0x59, 0x30,
-	0x36, 0xc3, 0xdd, 0x56, 0xe8, 0xb5, 0xc2, 0x22, 0xd6, 0x82, 0x36, 0xa4, 0x85, 0x96, 0x8d, 0xf2,
-	0xfc, 0xc3, 0x85, 0x7f, 0xf3, 0x2a, 0xd7, 0x32, 0xa9, 0xed, 0x37, 0xeb, 0x8c, 0x8d, 0x01, 0x8c,
-	0x85, 0x6a, 0xd6, 0x77, 0x42, 0x27, 0xea, 0x27, 0x26, 0xcf, 0xc8, 0xd8, 0x2d, 0x0c, 0xcd, 0x24,
-	0xa5, 0xa5, 0x2c, 0x05, 0xe6, 0x8a, 0x7c, 0x37, 0x74, 0xa3, 0xbf, 0x93, 0x33, 0xde, 0xfe, 0x94,
-	0x1f, 0x25, 0xf2, 0xf9, 0x5e, 0x99, 0x0c, 0x8c, 0xd3, 0x42, 0x62, 0x0f, 0xf0, 0x7f, 0x51, 0xe5,
-	0xdb, 0x95, 0xc4, 0x2f, 0x69, 0x5d, 0x93, 0x16, 0xfd, 0x98, 0x36, 0x6b, 0x1c, 0x6d, 0xe8, 0x68,
-	0x71, 0x4c, 0x50, 0xf0, 0xee, 0x80, 0x67, 0x11, 0x3b, 0x05, 0xb3, 0x7c, 0x5a, 0x8a, 0xc2, 0x5e,
-	0xe3, 0xd5, 0xc4, 0x9d, 0x28, 0x24, 0x3b, 0x81, 0x1e, 0x4a, 0x41, 0xaa, 0xf4, 0x3b, 0x66, 0xb2,
-	0x47, 0xec, 0x0a, 0xfe, 0xbc, 0x4a, 0x5c, 0xe5, 0x4b, 0xed, 0xbb, 0xa1, 0x13, 0x0d, 0x26, 0x21,
-	0x3f, 0xaa, 0x91, 0xdf, 0x0b, 0xda, 0xcc, 0x4d, 0x8d, 0x8f, 0x8d, 0x2e, 0xb1, 0x06, 0x76, 0x01,
-	0x23, 0x94, 0x2f, 0x55, 0x8e, 0x92, 0x52, 0x94, 0xa4, 0x05, 0x6a, 0xbf, 0x1b, 0x3a, 0x91, 0x97,
-	0x0c, 0x2d, 0x9f, 0x34, 0x74, 0x50, 0xc2, 0xf0, 0xdb, 0x35, 0x2c, 0x00, 0x6f, 0x7f, 0x0f, 0xf9,
-	0x4e, 0xe8, 0xd6, 0xdb, 0x5a, 0xcc, 0xae, 0xa1, 0x7f, 0xa8, 0xa9, 0xf3, 0xdb, 0xd2, 0x0f, 0x9e,
-	0xd9, 0xe5, 0xd3, 0x34, 0x53, 0x7c, 0xf9, 0x8c, 0xaa, 0xc8, 0xab, 0x82, 0x2b, 0xcc, 0x62, 0x0b,
-	0x14, 0xc5, 0x79, 0xb9, 0x46, 0x11, 0x9b, 0x67, 0x11, 0x67, 0x2a, 0x6e, 0x83, 0x17, 0x3d, 0xc3,
-	0x4d, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x43, 0x14, 0xd3, 0x72, 0x02, 0x00, 0x00,
+	// 397 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xb1, 0x6e, 0xe2, 0x40,
+	0x14, 0x45, 0x35, 0x18, 0x58, 0x33, 0xab, 0x05, 0x76, 0x8a, 0x95, 0xe5, 0x15, 0x92, 0x77, 0x9b,
+	0x38, 0xcd, 0x58, 0x02, 0xa5, 0x49, 0x13, 0x89, 0x74, 0x29, 0x52, 0x98, 0x24, 0x45, 0x1a, 0x6b,
+	0x80, 0xc1, 0xb1, 0xc0, 0x1e, 0xf2, 0xde, 0x38, 0x52, 0xbe, 0x22, 0x7f, 0x91, 0xef, 0xc9, 0x27,
+	0x45, 0x1e, 0x63, 0x83, 0xa3, 0x20, 0xa5, 0x48, 0xc7, 0xbd, 0xef, 0xdd, 0xcb, 0xcc, 0x19, 0x53,
+	0x57, 0x4b, 0xd4, 0xdb, 0x8d, 0xc8, 0x30, 0x28, 0x7e, 0x45, 0x20, 0x35, 0x3c, 0xf3, 0x2d, 0x28,
+	0xad, 0x58, 0xaf, 0x9e, 0xb9, 0x23, 0x33, 0xdc, 0x6e, 0x84, 0x5e, 0x29, 0x48, 0x03, 0x2d, 0x70,
+	0x8d, 0x5a, 0x68, 0x59, 0x6e, 0xfe, 0x7f, 0xeb, 0xd0, 0x5f, 0xb3, 0x3c, 0xd1, 0x32, 0x2c, 0xe2,
+	0x97, 0xab, 0x98, 0x8d, 0x28, 0x35, 0x11, 0x2c, 0x5c, 0x87, 0x78, 0xc4, 0xef, 0x85, 0xa6, 0xcf,
+	0xac, 0xb1, 0x2b, 0x3a, 0x30, 0x93, 0x08, 0x17, 0x32, 0x13, 0x90, 0x28, 0x74, 0x2c, 0xcf, 0xf2,
+	0x7f, 0x8e, 0xff, 0xf1, 0xfa, 0x4f, 0x79, 0xa3, 0x91, 0xcf, 0x76, 0x9b, 0x61, 0xdf, 0x24, 0x2b,
+	0x89, 0xec, 0x96, 0xfe, 0x9e, 0xe7, 0xc9, 0x66, 0x29, 0xe1, 0xa0, 0xad, 0x6d, 0xda, 0xfc, 0xa3,
+	0x6d, 0xd3, 0x32, 0x51, 0x97, 0x0e, 0xe7, 0x4d, 0x03, 0x59, 0x48, 0x87, 0x20, 0x05, 0xaa, 0xec,
+	0xa0, 0xb5, 0x63, 0x5a, 0x4f, 0x8e, 0xb6, 0x86, 0x26, 0x50, 0x97, 0x0e, 0xa0, 0xa1, 0xd1, 0x7d,
+	0x25, 0xd4, 0xae, 0x14, 0xfb, 0x4b, 0x0d, 0x90, 0x28, 0x13, 0x69, 0x45, 0xc8, 0x2e, 0x8c, 0x6b,
+	0x91, 0x4a, 0xf6, 0x87, 0x76, 0xcb, 0xb0, 0xd3, 0x32, 0x93, 0x9d, 0x62, 0xe7, 0xf4, 0xc7, 0x93,
+	0x84, 0x65, 0xb2, 0xd0, 0x8e, 0xe5, 0x11, 0xbf, 0x3f, 0xf6, 0x78, 0xe3, 0x69, 0xf8, 0x8d, 0xc0,
+	0xf5, 0xcc, 0x3c, 0xcd, 0x5d, 0xb9, 0x17, 0x56, 0x01, 0x76, 0x5a, 0xdc, 0xe8, 0x31, 0x4f, 0x40,
+	0x62, 0x04, 0x12, 0xb5, 0x00, 0xed, 0xb4, 0x3d, 0xe2, 0xdb, 0xc5, 0x41, 0x4b, 0x3f, 0x2c, 0x6d,
+	0x37, 0xa3, 0x83, 0x0f, 0x84, 0x98, 0x4b, 0xed, 0x1d, 0x23, 0x74, 0x88, 0x67, 0x15, 0xa7, 0xad,
+	0x34, 0xbb, 0xa0, 0xbd, 0x3d, 0xa4, 0xd6, 0x57, 0x1f, 0x72, 0x9f, 0x71, 0x5f, 0x08, 0xed, 0x37,
+	0xe1, 0x1d, 0x10, 0x20, 0xc7, 0x08, 0xb4, 0xbe, 0x83, 0x80, 0xf5, 0x29, 0x81, 0xe9, 0xd9, 0xfd,
+	0x24, 0x56, 0x7c, 0xf1, 0x00, 0x2a, 0x4d, 0xf2, 0x94, 0x2b, 0x88, 0x83, 0x4a, 0x28, 0x0c, 0x92,
+	0x6c, 0x05, 0x22, 0x30, 0x1f, 0x7f, 0x10, 0xab, 0xa0, 0xbe, 0xea, 0xbc, 0x6b, 0xbc, 0xc9, 0x7b,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x62, 0x14, 0xfe, 0x25, 0x58, 0x03, 0x00, 0x00,
 }
diff --git a/src/testplans/test_retry.proto b/src/testplans/test_retry.proto
index 458e52f..48efaf4 100644
--- a/src/testplans/test_retry.proto
+++ b/src/testplans/test_retry.proto
@@ -42,4 +42,19 @@
     repeated Scenario scenarios = 2;
   }
   repeated BuilderScenario builder_scenarios = 4;
+
+  // Reason scenario defines test failure conditions irrespective of which test.
+  message ReasonScenario {
+    // Failures reason.
+    string reason = 1;
+
+    // Verdict of the test run.
+    test_platform.TaskState.Verdict verdict = 2;
+
+    // Should the DUT/VM restart before retry?
+    bool requires_restart = 3;
+  }
+
+  // ReasonScenarios to retry for the suite.
+  repeated ReasonScenario reason_scenarios = 5;
 }