diff --git a/lib/checks/forms/autocomplete-appropriate.json b/lib/checks/forms/autocomplete-appropriate.json
index 93ddb96061..dda69e3b06 100644
--- a/lib/checks/forms/autocomplete-appropriate.json
+++ b/lib/checks/forms/autocomplete-appropriate.json
@@ -1,6 +1,7 @@
 {
   "id": "autocomplete-appropriate",
   "evaluate": "autocomplete-appropriate-evaluate",
+  "deprecated": true,
   "metadata": {
     "impact": "serious",
     "messages": {
diff --git a/lib/rules/autocomplete-valid.json b/lib/rules/autocomplete-valid.json
index f75ac6bd45..84f40ec38d 100644
--- a/lib/rules/autocomplete-valid.json
+++ b/lib/rules/autocomplete-valid.json
@@ -7,7 +7,7 @@
     "description": "Ensure the autocomplete attribute is correct and suitable for the form field",
     "help": "autocomplete attribute must be used correctly"
   },
-  "all": ["autocomplete-valid", "autocomplete-appropriate"],
+  "all": ["autocomplete-valid"],
   "any": [],
   "none": []
 }
diff --git a/test/act-mapping/autocomplete-valid.json b/test/act-mapping/autocomplete-valid.json
deleted file mode 100644
index 1d2f796d4b..0000000000
--- a/test/act-mapping/autocomplete-valid.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "73f2c2",
-  "title": "autocomplete attribute has valid value",
-  "axeRules": ["autocomplete-valid"]
-}
diff --git a/test/integration/rules/autocomplete-valid/autocomplete-valid.html b/test/integration/rules/autocomplete-valid/autocomplete-valid.html
index c14f419aa7..105d06128b 100644
--- a/test/integration/rules/autocomplete-valid/autocomplete-valid.html
+++ b/test/integration/rules/autocomplete-valid/autocomplete-valid.html
@@ -25,9 +25,6 @@
 <!-- comma seperated rather than space separated list -->
 <input autocomplete="work,email" id="fail4" />
 
-<!-- inappropriate field type -->
-<input type="number" autocomplete="email" id="fail5" />
-
 <!-- Incorrect element -->
 <button autocomplete="username" id="inapplicable1"></button>
 
@@ -150,10 +147,6 @@
 
 <input autocomplete="one-time-code" id="pass77" />
 
-<input autocomplete="street-address" id="fail6" type="file" />
-<input autocomplete="bday-month" type="month" id="fail7" />
-<input type="NUMBER" autocomplete="email" id="fail8" />
-
 <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" />
diff --git a/test/integration/rules/autocomplete-valid/autocomplete-valid.json b/test/integration/rules/autocomplete-valid/autocomplete-valid.json
index 937a387ce3..fafa4cc824 100644
--- a/test/integration/rules/autocomplete-valid/autocomplete-valid.json
+++ b/test/integration/rules/autocomplete-valid/autocomplete-valid.json
@@ -1,16 +1,7 @@
 {
   "description": "autocomplete-valid tests",
   "rule": "autocomplete-valid",
-  "violations": [
-    ["#fail1"],
-    ["#fail2"],
-    ["#fail3"],
-    ["#fail4"],
-    ["#fail5"],
-    ["#fail6"],
-    ["#fail7"],
-    ["#fail8"]
-  ],
+  "violations": [["#fail1"], ["#fail2"], ["#fail3"], ["#fail4"]],
   "passes": [
     ["#pass1"],
     ["#pass2"],
diff --git a/test/integration/virtual-rules/autocomplete-valid.js b/test/integration/virtual-rules/autocomplete-valid.js
index aeb2df1ae1..8c1c5ea268 100644
--- a/test/integration/virtual-rules/autocomplete-valid.js
+++ b/test/integration/virtual-rules/autocomplete-valid.js
@@ -40,18 +40,4 @@ describe('autocomplete-valid virtual-rule', function() {
     assert.lengthOf(results.violations, 1);
     assert.lengthOf(results.incomplete, 0);
   });
-
-  it('should fail when autocomplete is incorrectly used', function() {
-    var results = axe.runVirtualRule('autocomplete-valid', {
-      nodeName: 'input',
-      attributes: {
-        type: 'color',
-        autocomplete: 'email'
-      }
-    });
-
-    assert.lengthOf(results.passes, 0);
-    assert.lengthOf(results.violations, 1);
-    assert.lengthOf(results.incomplete, 0);
-  });
 });