diff --git a/lib/checks/forms/autocomplete-a11y-evaluate.js b/lib/checks/forms/autocomplete-a11y-evaluate.js
index 0e9683f09..f39b9212b 100644
--- a/lib/checks/forms/autocomplete-a11y-evaluate.js
+++ b/lib/checks/forms/autocomplete-a11y-evaluate.js
@@ -1,55 +1,77 @@
-import { isValidAutocomplete } from "../../commons/text";
+import { isValidAutocomplete } from '../../commons/text';
+import { ErrorHandler } from '../../../../a11y-engine-core/lib/core/errors/error-handler';
 
 function checkIsElementValidAutocomplete(node, options, virtualNode) {
-    const autocomplete = virtualNode.attr('autocomplete')?.toLowerCase().trim();
-    // if element has autocomplete attribute as off then it is not a violation
-    if(autocomplete === "off" || autocomplete==="chrome-off") {
-      return true;
-    } 
-  
-    // if it is on then we check whether name / id have valid autocomplete value or not
-    // same for the case if autocomplete is not present or has a non-standard value
-    if(!autocomplete || autocomplete === "on" || !isValidAutocomplete(autocomplete, options)) {
-      const name = virtualNode.attr('name');
-      const id = virtualNode.attr('id');
-      if((name && isValidAutocomplete(name, options)) || (id && isValidAutocomplete(id, options)))
-        return true;
-      return false;
-    }
-  
-    // if element autocomplete attribute is neither off nor on then we check if its a standard value
-    if(isValidAutocomplete(autocomplete, options)) {
+  const autocomplete = virtualNode
+    .attr('autocomplete')
+    ?.toLowerCase()
+    .trim();
+  // if element has autocomplete attribute as off then it is not a violation
+  if (autocomplete === 'off' || autocomplete === 'chrome-off') {
+    return true;
+  }
+
+  // if it is on then we check whether name / id have valid autocomplete value or not
+  // same for the case if autocomplete is not present or has a non-standard value
+  if (
+    !autocomplete ||
+    autocomplete === 'on' ||
+    !isValidAutocomplete(autocomplete, options)
+  ) {
+    const name = virtualNode.attr('name');
+    const id = virtualNode.attr('id');
+    if (
+      (name && isValidAutocomplete(name, options)) ||
+      (id && isValidAutocomplete(id, options))
+    ) {
       return true;
     }
-  
     return false;
   }
-  
-  function autocompleteA11yEvaluate(node, options, virtualNode) {
-    try {
-      const autocomplete = virtualNode.attr('autocomplete');
-  
-      // check if the autocomplete applicable element is inside form or exist freely
-      const closestForm = virtualNode.actualNode.closest("form");
-  
-      //if it exists inside the form and autocomplete for form is off
-      if(closestForm && (closestForm.getAttribute('autocomplete')?.toLowerCase().trim() === "off" 
-        || closestForm.getAttribute('autocomplete')?.toLowerCase().trim() === "chrome-off")) {
-        // if autocomplete attribute is not present for element then its a pass in this scenario
-        // otherwise check all posibilities with the method
-        return autocomplete ? checkIsElementValidAutocomplete(node, options, virtualNode) : true;
-      } else {
-        // The else case is if form is present and it has autocomplete as on or not set and 
-        // the other case this handles is that element exists independently
-  
-        // this method would check for all posibilities
-        return checkIsElementValidAutocomplete(node, options, virtualNode);
-      }  
-    }
-    catch(err) {
-      ErrorHandler.addCheckError("autocomplete-attribute-valid-check", err);
-      return undefined;
+
+  // if element autocomplete attribute is neither off nor on then we check if its a standard value
+  if (isValidAutocomplete(autocomplete, options)) {
+    return true;
+  }
+
+  return false;
+}
+
+function autocompleteA11yEvaluate(node, options, virtualNode) {
+  try {
+    const autocomplete = virtualNode.attr('autocomplete');
+
+    // check if the autocomplete applicable element is inside form or exist freely
+    const closestForm = virtualNode.actualNode.closest('form');
+
+    //if it exists inside the form and autocomplete for form is off
+    if (
+      closestForm &&
+      (closestForm
+        .getAttribute('autocomplete')
+        ?.toLowerCase()
+        .trim() === 'off' ||
+        closestForm
+          .getAttribute('autocomplete')
+          ?.toLowerCase()
+          .trim() === 'chrome-off')
+    ) {
+      // if autocomplete attribute is not present for element then its a pass in this scenario
+      // otherwise check all posibilities with the method
+      return autocomplete
+        ? checkIsElementValidAutocomplete(node, options, virtualNode)
+        : true;
+    } else {
+      // The else case is if form is present and it has autocomplete as on or not set and
+      // the other case this handles is that element exists independently
+
+      // this method would check for all posibilities
+      return checkIsElementValidAutocomplete(node, options, virtualNode);
     }
+  } catch (err) {
+    ErrorHandler.addCheckError('autocomplete-attribute-valid-check', err);
+    return undefined;
   }
-  
-  export default autocompleteA11yEvaluate;
\ No newline at end of file
+}
+
+export default autocompleteA11yEvaluate;
diff --git a/test/checks/forms/autocomplete-valid.js b/test/checks/forms/autocomplete-valid.js
index 804a523f4..795393e80 100644
--- a/test/checks/forms/autocomplete-valid.js
+++ b/test/checks/forms/autocomplete-valid.js
@@ -11,22 +11,200 @@ describe('autocomplete-valid', function() {
     checkContext.reset();
   });
 
-  it('returns true if autocomplete is valid', function() {
-    var params = checkSetup('<input autocomplete="on" id="target" />');
+  // original axe-core's check test
+
+  // it('returns true if autocomplete is valid', function() {
+  //   var params = checkSetup('<input autocomplete="on" id="target" />');
+  //   assert.isTrue(evaluate.apply(checkContext, params));
+  // });
+
+  // it('returns false if autocomplete is not valid', function() {
+  //   var params = checkSetup('<input autocomplete="foo" id="target" />');
+  //   assert.isFalse(evaluate.apply(checkContext, params));
+  // });
+
+  // it('uses options to change what is valid autocomplete', function() {
+  //   var options = { stateTerms: ['foo'] };
+  //   var params = checkSetup(
+  //     '<input autocomplete="foo" id="target" />',
+  //     options
+  //   );
+  //   assert.isTrue(evaluate.apply(checkContext, params));
+  // });
+
+  it("evaluate() passes a document if form element has autocomplete set off and child elements don't have autocomplete", function() {
+    console.log('Our functions are running fine');
+    var params = checkSetup(
+      '<html> <form autocomplete="off" onsubmit="javascript(0)"> <input type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if form element has autocomplete set off and child elements have autocomplete as off', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="off" onsubmit="javascript(0)"> <input autocomplete="off" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if form element has autocomplete set off and child elements have standard autcomplete value', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="off" onsubmit="javascript(0)"> <input autocomplete="username" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if form element has autocomplete set off, child elements have on autocomplete value and name or id has standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="off" onsubmit="javascript(0)"> <input autocomplete="on" name="name" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() fails a document if form element has autocomplete set off and child elements have on autocomplete value and name or id has non-standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="off" onsubmit="javascript(0)"> <input autocomplete="on" name="xname" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isFalse(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if form element has autocomplete set off, child elements have non-standard autocomplete value and name or id has standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="off" onsubmit="javascript(0)"> <input autocomplete="xname" name="name" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() fails a document if form element has autocomplete set off, child elements have non-standard autocomplete value and name or id has non-standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="off" onsubmit="javascript(0)"> <input autocomplete="xname" name="xname" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isFalse(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if form element has autocomplete set on and child elements have autocomplete set to off', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="on" onsubmit="javascript(0)"> <input autocomplete="off" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate() passes a document if form element doesn't have autocomplete set and child elements have autocomplete set to off", function() {
+    var params = checkSetup(
+      '<html> <form  onsubmit="javascript(0)"> <input autocomplete="off" type="text" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if form element has autocomplete set on and child elements have autocomplete set to standard irrespective of name and id', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="on" onsubmit="javascript(0)"> <input autocomplete="name" type="text" name="xname" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate() passes a document if form element doesn't have autocomplete set and child elements have autocomplete set to standard irrespective of name and id", function() {
+    var params = checkSetup(
+      '<html> <form onsubmit="javascript(0)"> <input autocomplete="name" type="text" name="xname" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if form element has autocomplete set on and child elements have autocomplete set on and name/id have a standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="on" onsubmit="javascript(0)"> <input autocomplete="on" type="text" name="name" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate() passes a document if form element doesn't have autocomplete set and child elements have autocomplete set on and name/id have a standard autocomplete value", function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="on" onsubmit="javascript(0)"> <input autocomplete="on" type="text" name="name" id="target"/> <button>Save</button> </form> </html>'
+    );
     assert.isTrue(evaluate.apply(checkContext, params));
   });
 
-  it('returns false if autocomplete is not valid', function() {
-    var params = checkSetup('<input autocomplete="foo" id="target" />');
+  it('evaluate() fails a document if form element has autocomplete set on and child elements have autocomplete set on and name/id have a non-standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="on" onsubmit="javascript(0)"> <input autocomplete="on" type="text" name="xname" id="target"/> <button>Save</button> </form> </html>'
+    );
     assert.isFalse(evaluate.apply(checkContext, params));
   });
 
-  it('uses options to change what is valid autocomplete', function() {
-    var options = { stateTerms: ['foo'] };
+  it("evaluate() fails a document if form element doesn't have autcomplete set and child elements have autocomplete set on and name/id have a non-standard autocomplete value", function() {
+    var params = checkSetup(
+      '<html> <form onsubmit="javascript(0)"> <input autocomplete="on" type="text" name="xname" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isFalse(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate() passes a document if form element has autocomplete set on and child elements don't have autocomplete set and name/id have a standard autocomplete value", function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="on" onsubmit="javascript(0)"> <input type="text" name="name" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate() passes a document if form element doesn't have autocomplete set and child elements don't have autocomplete set and name/id have a standard autocomplete value", function() {
     var params = checkSetup(
-      '<input autocomplete="foo" id="target" />',
-      options
+      '<html> <form onsubmit="javascript(0)"> <input type="text" name="name" id="target"/> <button>Save</button> </form> </html>'
     );
     assert.isTrue(evaluate.apply(checkContext, params));
   });
+
+  it("evaluate() fails a document if form element has autocomplete set on and child elements don't have autocomplete set and name/id have a non-standard autocomplete value", function() {
+    var params = checkSetup(
+      '<html> <form autocomplete="on" onsubmit="javascript(0)"> <input type="text" name="xname" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isFalse(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate() fails a document if form element doesn't have autocomplete set and child elements don't have autocomplete set and name/id have a non-standard autocomplete value", function() {
+    var params = checkSetup(
+      '<html> <form onsubmit="javascript(0)"> <input type="text" name="xname" id="target"/> <button>Save</button> </form> </html>'
+    );
+    assert.isFalse(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if element is independent and have autocomplete set to off', function() {
+    var params = checkSetup(
+      '<html> <input autocomplete="off" type="text" id="target"/> <button>Save</button> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if element is independent and have autocomplete set to standard irrespective of name and id', function() {
+    var params = checkSetup(
+      '<html> <input autocomplete="name" type="text" name="xname" id="target"/> <button>Save</button> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() passes a document if element is independent and have autocomplete set on and name/id have a standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <input autocomplete="on" type="text" name="name" id="target"/> <button>Save</button> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it('evaluate() fails a document if element is independent and have autocomplete set on and name/id have a non-standard autocomplete value', function() {
+    var params = checkSetup(
+      '<html> <input autocomplete="on" type="text" name="xname" id="target"/> <button>Save</button> </html>'
+    );
+    assert.isFalse(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate()passes a document if element is independent and don't have autocomplete set and name/id have a standard autocomplete value", function() {
+    var params = checkSetup(
+      '<html> <input type="text" name="name" id="target"/> <button>Save</button> </html>'
+    );
+    assert.isTrue(evaluate.apply(checkContext, params));
+  });
+
+  it("evaluate() fails a document if element is independent and don't have autocomplete set and name/id have a non-standard autocomplete value", function() {
+    var params = checkSetup(
+      '<html> <input type="text" name="xname" id="target"/> <button>Save</button> </html>'
+    );
+    assert.isFalse(evaluate.apply(checkContext, params));
+  });
 });
diff --git a/test/integration/rules/autocomplete-valid/autocomplete-valid.html b/test/integration/rules/autocomplete-valid/autocomplete-valid.html
index e38a7798a..eec22911e 100644
--- a/test/integration/rules/autocomplete-valid/autocomplete-valid.html
+++ b/test/integration/rules/autocomplete-valid/autocomplete-valid.html
@@ -7,11 +7,9 @@
 
 <textarea autocomplete="Street-Address" id="pass3"></textarea>
 
-<input autocomplete="Work EMail" id="pass4" />
+<input autocomplete="section-partner email" id="pass4" />
 
-<input autocomplete="section-partner email" id="pass5" />
-
-<input autocomplete="section-primary shipping work email" id="pass6" />
+<input autocomplete="section-primary shipping work email" id="pass5" />
 
 <!-- Unknown autocomplete term -->
 <input autocomplete="badterm" id="fail1" />
@@ -29,10 +27,10 @@
 <button autocomplete="username" id="inapplicable1"></button>
 
 <!-- Empty attribute -->
-<input autocomplete="" id="inapplicable2" />
+<input autocomplete="" id="fail5" />
 
 <!-- Hidden through display:none -->
-<input autocomplete="username" style="display:none" id="inapplicable3" />
+<input autocomplete="username" style="display:none" id="inapplicable2" />
 
 <!-- Off screen and not focusable -->
 <input
@@ -40,20 +38,20 @@
   tabindex="-1"
   aria-hidden="true"
   style="position:absolute; top:-9999em"
-  id="inapplicable4"
+  id="inapplicable3"
 />
 
 <!-- input button -->
-<input type="button" autocomplete="username" id="inapplicable5" />
+<input type="button" autocomplete="username" id="inapplicable4" />
 
 <!-- hidden -->
-<input type="hidden" autocomplete="username" id="inapplicable6" />
+<input type="hidden" autocomplete="username" id="inapplicable5" />
 
 <!-- native disabled -->
-<input autocomplete="username" disabled id="inapplicable7" />
+<input autocomplete="username" disabled id="inapplicable6" />
 
 <!-- ARIA disabled -->
-<input autocomplete="username" aria-disabled="true" id="inapplicable8" />
+<input autocomplete="username" aria-disabled="true" id="inapplicable7" />
 
 <!-- non-widget element -->
 <input
@@ -61,103 +59,103 @@
   role="none"
   tabindex="-1"
   autocomplete="username"
-  id="inapplicable9"
+  id="inapplicable8"
 />
-<input autocomplete="  " id="inapplicable10" />
-
-<input autocomplete="on" id="pass7" />
-<input autocomplete=" on " id="pass8" />
-<input autocomplete=" OFF " id="pass9" />
-<input autocomplete="   name   " id="pass10" />
-<input autocomplete="honorific-prefix" id="pass11" />
-<input autocomplete="GIVEN-NAME" id="pass12" />
-<input autocomplete="additional-name" id="pass13" />
-<input autocomplete="section-foo billing family-name" id="pass14" />
-<input autocomplete="honorific-suffix" id="pass15" />
-<input autocomplete="nickname" id="pass16" />
-<input autocomplete="USERNAME" id="pass17" />
-<input autocomplete="section-foo new-password" id="pass18" />
-<input autocomplete="shipping current-password" id="pass19" />
-<input autocomplete="organization-title" id="pass20" />
-<input autocomplete="organization" id="pass21" />
-<textarea autocomplete="section-foo street-address" id="pass22"></textarea>
-<input autocomplete="address-line1" id="pass23" />
-<input autocomplete="billing address-line2" id="pass24" />
-<input autocomplete="address-line3" id="pass25" />
-<input autocomplete="section-foo address-level4" id="pass26" />
-<input autocomplete="address-level3" id="pass27" />
-<input autocomplete="address-level2" id="pass28" />
-<input autocomplete="SHIPPING address-level1" id="pass29" />
-<input autocomplete="section-foo country" id="pass30" />
-<input autocomplete="country-name" id="pass31" />
-<input autocomplete="postal-code" id="pass32" />
-<input autocomplete="CC-name" id="pass33" />
-<input autocomplete="section-foo billing cc-given-name" id="pass34" />
-<input autocomplete="cc-additional-name" id="pass35" />
-<input autocomplete="cc-family-name" id="pass36" />
-<input autocomplete="cc-number" id="pass37" />
-<input autocomplete="section-foo cc-exp" id="pass38" />
-<input autocomplete="shipping CC-Exp-Month" id="pass39" />
-<input autocomplete="cc-exp-year" id="pass40" />
-<input autocomplete="cc-csc" id="pass41" />
-<input autocomplete="section-foo cc-type" id="pass42" />
-<input autocomplete="transaction-currency" id="pass43" />
-<input autocomplete="billing transaction-amount" id="pass44" />
-<input autocomplete="language" id="pass45" />
-<input autocomplete="section-foo bday" id="pass46" />
-<input autocomplete="bday-day" id="pass47" />
-<input autocomplete="bday-month" id="pass48" />
-<input autocomplete="section-foo shipping bday-year" id="pass49" />
-<input autocomplete="sex" id="pass50" />
-<input autocomplete="url" id="pass51" />
-<input autocomplete="photo" id="pass52" />
-<input autocomplete="section-foo photo" id="pass53" />
-<input autocomplete="HOME TEL" id="pass54" />
-<input autocomplete="section-foo shipping work tel-country-code" id="pass55" />
-<input autocomplete="mobile tel-national" id="pass56" />
-<input autocomplete="fax tel-area-code" id="pass57" />
-<input autocomplete="pager tel-local" id="pass58" />
-<input autocomplete="home tel-local-prefix" id="pass59" />
-<input autocomplete="work tel-local-suffix" id="pass60" />
-<input autocomplete="SECTION-foo mobile tel-extension" id="pass61" />
-<input autocomplete="fax email" id="pass62" />
-<input type="username" autocomplete="email" id="pass83" />
-<input autocomplete="pager impp" id="pass63" />
+<input autocomplete="  " id="fail6" />
+
+<input autocomplete="on" id="fail7" />
+<input autocomplete=" on " id="fail8" />
+<input autocomplete=" OFF " id="pass6" />
+<input autocomplete="   name   " id="pass7" />
+<input autocomplete="honorific-prefix" id="pass8" />
+<input autocomplete="GIVEN-NAME" id="pass9" />
+<input autocomplete="additional-name" id="pass10" />
+<input autocomplete="section-foo billing family-name" id="pass11" />
+<input autocomplete="honorific-suffix" id="pass12" />
+<input autocomplete="nickname" id="pass13" />
+<input autocomplete="USERNAME" id="pass14" />
+<input autocomplete="section-foo new-password" id="pass15" />
+<input autocomplete="shipping current-password" id="pass16" />
+<input autocomplete="organization-title" id="pass17" />
+<input autocomplete="organization" id="pass18" />
+<textarea autocomplete="section-foo street-address" id="pass19"></textarea>
+<input autocomplete="address-line1" id="pass20" />
+<input autocomplete="billing address-line2" id="pass21" />
+<input autocomplete="address-line3" id="pass22" />
+<input autocomplete="section-foo address-level4" id="pass23" />
+<input autocomplete="address-level3" id="pass24" />
+<input autocomplete="address-level2" id="pass25" />
+<input autocomplete="SHIPPING address-level1" id="pass26" />
+<input autocomplete="section-foo country" id="pass27" />
+<input autocomplete="country-name" id="pass28" />
+<input autocomplete="postal-code" id="pass29" />
+<input autocomplete="CC-name" id="pass30" />
+<input autocomplete="section-foo billing cc-given-name" id="pass31" />
+<input autocomplete="cc-additional-name" id="pass32" />
+<input autocomplete="cc-family-name" id="pass33" />
+<input autocomplete="cc-number" id="pass34" />
+<input autocomplete="section-foo cc-exp" id="pass35" />
+<input autocomplete="shipping CC-Exp-Month" id="pass36" />
+<input autocomplete="cc-exp-year" id="pass37" />
+<input autocomplete="cc-csc" id="pass38" />
+<input autocomplete="section-foo cc-type" id="pass39" />
+<input autocomplete="transaction-currency" id="pass40" />
+<input autocomplete="billing transaction-amount" id="pass41" />
+<input autocomplete="language" id="pass42" />
+<input autocomplete="section-foo bday" id="pass43" />
+<input autocomplete="bday-day" id="pass44" />
+<input autocomplete="bday-month" id="pass45" />
+<input autocomplete="section-foo shipping bday-year" id="pass46" />
+<input autocomplete="sex" id="pass47" />
+<input autocomplete="url" id="pass48" />
+<input autocomplete="photo" id="pass49" />
+<input autocomplete="section-foo photo" id="pass50" />
+<input autocomplete="HOME TEL" id="pass51" />
+<input autocomplete="section-foo shipping work tel-country-code" id="pass52" />
+<input autocomplete="mobile tel-national" id="pass53" />
+<input autocomplete="fax tel-area-code" id="pass54" />
+<input autocomplete="pager tel-local" id="pass55" />
+<input autocomplete="home tel-local-prefix" id="pass56" />
+<input autocomplete="work tel-local-suffix" id="pass57" />
+<input autocomplete="SECTION-foo mobile tel-extension" id="pass58" />
+<input autocomplete="fax email" id="pass59" />
+<input type="username" autocomplete="email" id="pass60" />
+<input autocomplete="pager impp" id="pass61" />
 <input
   autocomplete="off"
-  id="pass64"
+  id="pass62"
   name="input_1"
   placeholder="Numeric Input Field"
   value="42"
   type="tel"
 />
-<input autocomplete="on" id="pass65" value="" type="url" />
-<input autocomplete="off" id="pass66" value="42" type="datetime-local" />
-<input autocomplete="street-address" id="pass67" type="text" />
-<input autocomplete="on" id="pass68" value="" type="url     " />
-<input autocomplete="off" id="pass69" value="42" type="   DateTime-Local" />
-
-<input autocomplete="tel-country-code" id="pass70" type="tel" />
-<input autocomplete="tel-national" id="pass71" type="tel" />
-<input autocomplete="tel-area-code" id="pass72" type="tel" />
-<input autocomplete="tel-local" id="pass73" type="tel" />
-<input autocomplete="tel-local-prefix" id="pass74" type="tel" />
-<input autocomplete="tel-local-suffix" id="pass75" type="tel" />
-<input autocomplete="tel-extension" id="pass76" type="tel" />
-
-<input autocomplete="one-time-code" id="pass77" />
-
-<input autocomplete="cc-number" type="tel" id="pass78" />
-<input autocomplete="cc-exp" type="tel" id="pass79" />
-<input autocomplete="cc-exp-month" type="tel" id="pass80" />
-<input autocomplete="cc-exp-year" type="tel" id="pass81" />
-<input autocomplete="cc-csc" type="tel" id="pass82" />
+<input autocomplete="on" id="fail9" value="" type="url" />
+<input autocomplete="off" id="pass63" value="42" type="datetime-local" />
+<input autocomplete="street-address" id="pass64" type="text" />
+<input autocomplete="on" id="fail10" value="" type="url     " />
+<input autocomplete="off" id="pass78" value="42" type="   DateTime-Local" />
+
+<input autocomplete="tel-country-code" id="pass65" type="tel" />
+<input autocomplete="tel-national" id="pass66" type="tel" />
+<input autocomplete="tel-area-code" id="pass67" type="tel" />
+<input autocomplete="tel-local" id="pass68" type="tel" />
+<input autocomplete="tel-local-prefix" id="pass69" type="tel" />
+<input autocomplete="tel-local-suffix" id="pass70" type="tel" />
+<input autocomplete="tel-extension" id="pass71" type="tel" />
+
+<input autocomplete="one-time-code" id="pass72" />
+
+<input autocomplete="cc-number" type="tel" id="pass73" />
+<input autocomplete="cc-exp" type="tel" id="pass74" />
+<input autocomplete="cc-exp-month" type="tel" id="pass75" />
+<input autocomplete="cc-exp-year" type="tel" id="pass76" />
+<input autocomplete="cc-csc" type="tel" id="pass77" />
 
 <!-- Attribute values that contains synonyms of on/off -->
-<input autocomplete="none" id="pass84" />
-<input autocomplete="false" id="pass85" />
-<input autocomplete="true" id="pass86" />
-<input autocomplete="disabled" id="pass87" />
-<input autocomplete="enabled" id="pass88" />
-<input autocomplete="undefined" id="pass89" />
-<input autocomplete="null" id="pass90" />
+<input autocomplete="none" id="pass78" />
+<input autocomplete="false" id="pass79" />
+<input autocomplete="true" id="pass80" />
+<input autocomplete="disabled" id="pass81" />
+<input autocomplete="enabled" id="pass82" />
+<input autocomplete="undefined" id="pass83" />
+<input autocomplete="null" id="pass84" />
diff --git a/test/integration/rules/autocomplete-valid/autocomplete-valid.json b/test/integration/rules/autocomplete-valid/autocomplete-valid.json
index b4eceb260..7f2fbc52c 100644
--- a/test/integration/rules/autocomplete-valid/autocomplete-valid.json
+++ b/test/integration/rules/autocomplete-valid/autocomplete-valid.json
@@ -1,7 +1,18 @@
 {
   "description": "autocomplete-valid tests",
   "rule": "autocomplete-valid",
-  "violations": [["#fail1"], ["#fail2"], ["#fail3"], ["#fail4"]],
+  "violations": [
+    ["#fail1"],
+    ["#fail2"],
+    ["#fail3"],
+    ["#fail4"],
+    ["#fail5"],
+    ["#fail6"],
+    ["#fail7"],
+    ["#fail8"],
+    ["#fail9"],
+    ["#fail10"]
+  ],
   "passes": [
     ["#pass1"],
     ["#pass2"],
@@ -86,12 +97,6 @@
     ["#pass81"],
     ["#pass82"],
     ["#pass83"],
-    ["#pass84"],
-    ["#pass85"],
-    ["#pass86"],
-    ["#pass87"],
-    ["#pass88"],
-    ["#pass89"],
-    ["#pass90"]
+    ["#pass84"]
   ]
 }
diff --git a/test/rule-matches/autocomplete-matches.js b/test/rule-matches/autocomplete-matches.js
index fd5579d62..298598d0f 100644
--- a/test/rule-matches/autocomplete-matches.js
+++ b/test/rule-matches/autocomplete-matches.js
@@ -46,9 +46,9 @@ describe('autocomplete-matches', function() {
     });
   });
 
-  it('returns false for elements with an empty autocomplete', function() {
+  it('returns true for elements with an empty autocomplete', function() {
     var vNode = queryFixture('<input id="target" autocomplete="  ">');
-    assert.isFalse(rule.matches(null, vNode));
+    assert.isTrue(rule.matches(null, vNode));
   });
 
   it('returns false for intput[type=hidden]', function() {