diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 1e7e529091..6962322eba 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -393,8 +393,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     break;
                 } else if (!fillFields.exp && this.isFieldMatch(f[attr],
                     CreditCardAutoFillConstants.CardExpiryFieldNames,
-                    ['mm-yy', 'mm-yyyy', 'yy-mm', 'yyyy-mm', 'expiration-date',
-                        'payment-card-expiration'])) {
+                    CreditCardAutoFillConstants.CardExpiryFieldNameValues)) {
                     fillFields.exp = f;
                     break;
                 } else if (!fillFields.expMonth && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index a969c1e8d0..2627affaad 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -124,6 +124,15 @@ export class CreditCardAutoFillConstants {
     "payment-cc-date",
   ];
 
+  static readonly CardExpiryFieldNameValues: string[] = [
+    "mm-yy",
+    "mm-yyyy",
+    "yy-mm",
+    "yyyy-mm",
+    "expiration-date",
+    "payment-card-expiration",
+  ];
+
   static readonly ExpiryMonthFieldNames: string[] = [
     "exp-month",
     "cc-exp-month",