diff --git a/lib/checks/lists/dlitem.js b/lib/checks/lists/dlitem.js
index 80a6608fc7..b4f11e5315 100644
--- a/lib/checks/lists/dlitem.js
+++ b/lib/checks/lists/dlitem.js
@@ -1,2 +1,22 @@
-var parent = axe.commons.dom.getComposedParent(node);
-return parent.nodeName.toUpperCase() === 'DL';
+const parent = axe.commons.dom.getComposedParent(node);
+const parentTagName = parent.nodeName.toUpperCase();
+
+if (parentTagName !== 'DL') {
+	return false;
+}
+
+const parentRole = (parent.getAttribute('role') || '').toLowerCase();
+
+if (!parentRole) {
+	return true;
+}
+
+if (!axe.commons.aria.isValidRole(parentRole)) {
+	return false;
+}
+
+if (parentRole === 'list') {
+	return true;
+}
+
+return false;
diff --git a/lib/checks/lists/listitem.js b/lib/checks/lists/listitem.js
index 2feabc4673..3270c8b4e3 100644
--- a/lib/checks/lists/listitem.js
+++ b/lib/checks/lists/listitem.js
@@ -1,5 +1,18 @@
-var parent = axe.commons.dom.getComposedParent(node);
+const parent = axe.commons.dom.getComposedParent(node);
+if (!parent) {
+	return false;
+}
+
+const ALLOWED_TAGS = ['UL', 'OL'];
+const parentTagName = parent.nodeName.toUpperCase();
+
+const parentRole = (parent.getAttribute('role') || '').toLowerCase();
+if (parentRole && !axe.commons.aria.isValidRole(parentRole)) {
+	return false;
+}
+
+const isListRole = parentRole === 'list';
 return (
-	['UL', 'OL'].includes(parent.nodeName.toUpperCase()) ||
-	(parent.getAttribute('role') || '').toLowerCase() === 'list'
+	(ALLOWED_TAGS.includes(parentTagName) && (!parentRole || isListRole)) ||
+	isListRole
 );
diff --git a/lib/checks/lists/only-dlitems.js b/lib/checks/lists/only-dlitems.js
index c71891dd6d..5227fb60de 100644
--- a/lib/checks/lists/only-dlitems.js
+++ b/lib/checks/lists/only-dlitems.js
@@ -1,33 +1,41 @@
-var bad = [],
-	permitted = [
-		'STYLE',
-		'META',
-		'LINK',
-		'MAP',
-		'AREA',
-		'SCRIPT',
-		'DATALIST',
-		'TEMPLATE'
-	],
-	hasNonEmptyTextNode = false;
+const ALLOWED_TAGS = [
+	'STYLE',
+	'META',
+	'LINK',
+	'MAP',
+	'AREA',
+	'SCRIPT',
+	'DATALIST',
+	'TEMPLATE'
+];
 
-virtualNode.children.forEach(({ actualNode }) => {
-	var nodeName = actualNode.nodeName.toUpperCase();
-	if (
-		actualNode.nodeType === 1 &&
-		nodeName !== 'DT' &&
-		nodeName !== 'DD' &&
-		permitted.indexOf(nodeName) === -1
-	) {
-		bad.push(actualNode);
+const ALLOWED_ROLES = ['definition', 'term', 'list'];
+
+let base = {
+	badNodes: [],
+	hasNonEmptyTextNode: false
+};
+
+const result = virtualNode.children.reduce((out, childNode) => {
+	const { actualNode } = childNode;
+	const tagName = actualNode.nodeName.toUpperCase();
+
+	if (actualNode.nodeType === 1 && !ALLOWED_TAGS.includes(tagName)) {
+		const role = (actualNode.getAttribute('role') || '').toLowerCase();
+		if ((tagName !== 'DT' && tagName !== 'DD') || role) {
+			if (!ALLOWED_ROLES.includes(role)) {
+				// handle comment - https://github.com/dequelabs/axe-core/pull/518/files#r139284668
+				out.badNodes.push(actualNode);
+			}
+		}
 	} else if (actualNode.nodeType === 3 && actualNode.nodeValue.trim() !== '') {
-		hasNonEmptyTextNode = true;
+		out.hasNonEmptyTextNode = true;
 	}
-});
+	return out;
+}, base);
 
-if (bad.length) {
-	this.relatedNodes(bad);
+if (result.badNodes.length) {
+	this.relatedNodes(result.badNodes);
 }
 
-var retVal = !!bad.length || hasNonEmptyTextNode;
-return retVal;
+return !!result.badNodes.length || result.hasNonEmptyTextNode;
diff --git a/lib/checks/lists/only-listitems.js b/lib/checks/lists/only-listitems.js
index cdb88c62db..5a66a4b0e2 100644
--- a/lib/checks/lists/only-listitems.js
+++ b/lib/checks/lists/only-listitems.js
@@ -1,31 +1,84 @@
-var bad = [],
-	permitted = [
-		'STYLE',
-		'META',
-		'LINK',
-		'MAP',
-		'AREA',
-		'SCRIPT',
-		'DATALIST',
-		'TEMPLATE'
-	],
-	hasNonEmptyTextNode = false;
-
-virtualNode.children.forEach(({ actualNode }) => {
-	var nodeName = actualNode.nodeName.toUpperCase();
-	if (
-		actualNode.nodeType === 1 &&
-		nodeName !== 'LI' &&
-		permitted.indexOf(nodeName) === -1
-	) {
-		bad.push(actualNode);
-	} else if (actualNode.nodeType === 3 && actualNode.nodeValue.trim() !== '') {
-		hasNonEmptyTextNode = true;
+const ALLOWED_TAGS = [
+	'STYLE',
+	'META',
+	'LINK',
+	'MAP',
+	'AREA',
+	'SCRIPT',
+	'DATALIST',
+	'TEMPLATE'
+];
+
+const getIsListItemRole = (role, tagName) => {
+	return role === 'listitem' || (tagName === 'LI' && !role);
+};
+
+const getHasListItem = (hasListItem, tagName, isListItemRole) => {
+	return hasListItem || (tagName === 'LI' && isListItemRole) || isListItemRole;
+};
+
+let base = {
+	badNodes: [],
+	isEmpty: true,
+	hasNonEmptyTextNode: false,
+	hasListItem: false,
+	liItemsWithRole: 0
+};
+
+let out = virtualNode.children.reduce((out, { actualNode }) => {
+	/*eslint 
+		max-statements: ["error", 20]
+		complexity: ["error", 11] 
+		*/
+	const tagName = actualNode.nodeName.toUpperCase();
+
+	if (actualNode.nodeType === 1) {
+		if (!ALLOWED_TAGS.includes(tagName)) {
+			const role = (actualNode.getAttribute('role') || '').toLowerCase();
+			const isListItemRole = getIsListItemRole(role, tagName);
+
+			out.hasListItem = getHasListItem(
+				out.hasListItem,
+				tagName,
+				isListItemRole
+			);
+
+			if (isListItemRole) {
+				out.isEmpty = false;
+			}
+			if (tagName === 'LI' && !isListItemRole) {
+				out.liItemsWithRole++;
+			}
+			if (tagName !== 'LI' && !isListItemRole) {
+				out.badNodes.push(actualNode);
+			}
+		}
+	}
+	if (actualNode.nodeType === 3) {
+		if (actualNode.nodeValue.trim() !== '') {
+			out.hasNonEmptyTextNode = true;
+		}
+	}
+
+	return out;
+}, base);
+
+const virtualNodeChildrenOfTypeLi = virtualNode.children.filter(
+	({ actualNode }) => {
+		return actualNode.nodeName.toUpperCase() === 'LI';
 	}
-});
+);
+
+const allLiItemsHaveRole =
+	out.liItemsWithRole > 0 &&
+	virtualNodeChildrenOfTypeLi.length === out.liItemsWithRole;
 
-if (bad.length) {
-	this.relatedNodes(bad);
+if (out.badNodes.length) {
+	this.relatedNodes(out.badNodes);
 }
 
-return !!bad.length || hasNonEmptyTextNode;
+const isInvalidListItem = !(
+	out.hasListItem ||
+	(out.isEmpty && !allLiItemsHaveRole)
+);
+return isInvalidListItem || !!out.badNodes.length || out.hasNonEmptyTextNode;
diff --git a/lib/core/utils/flattened-tree.js b/lib/core/utils/flattened-tree.js
index ada61d96d4..80f977e992 100644
--- a/lib/core/utils/flattened-tree.js
+++ b/lib/core/utils/flattened-tree.js
@@ -94,7 +94,10 @@ axe.utils.getFlattenedTree = function(node, shadowId) {
 		if (nodeName === 'content') {
 			realArray = Array.from(node.getDistributedNodes());
 			return realArray.reduce(reduceShadowDOM, []);
-		} else if (nodeName === 'slot' && typeof node.assignedNodes === 'function') {
+		} else if (
+			nodeName === 'slot' &&
+			typeof node.assignedNodes === 'function'
+		) {
 			realArray = Array.from(node.assignedNodes());
 			if (!realArray.length) {
 				// fallback content
diff --git a/test/checks/lists/dlitem.js b/test/checks/lists/dlitem.js
index fe85c26535..77e7f144b8 100644
--- a/test/checks/lists/dlitem.js
+++ b/test/checks/lists/dlitem.js
@@ -1,49 +1,60 @@
-describe('dlitem', function() {
+describe('dlitem', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
 	var checkSetup = axe.testUtils.checkSetup;
 	var shadowSupport = axe.testUtils.shadowSupport;
 
-	afterEach(function() {
+	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
-	it('should pass if the dlitem has a parent <dl>', function() {
+	it('should pass if the dlitem has a parent <dl>', function () {
 		var checkArgs = checkSetup('<dl><dt id="target">My list item</dl>');
 
 		assert.isTrue(checks.dlitem.evaluate.apply(null, checkArgs));
 	});
 
-	it('should fail if the dlitem has an incorrect parent', function() {
+	it('should fail if the dt element has an incorrect parent', function () {
 		var checkArgs = checkSetup('<video><dt id="target">My list item</video>');
 
 		assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport.v1 ? it : xit)(
-		'should return true in a shadow DOM pass',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<dt>My list item </dt>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<dl><slot></slot></dl>';
-
-			var checkArgs = checkSetup(node, 'dt');
-			assert.isTrue(checks.dlitem.evaluate.apply(null, checkArgs));
-		}
-	);
-
-	(shadowSupport.v1 ? it : xit)(
-		'should return false in a shadow DOM fail',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<dt>My list item </dt>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<div><slot></slot></div>';
-
-			var checkArgs = checkSetup(node, 'dt');
-			assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
-		}
-	);
+	it('should pass if the dt element has a parent <dl> with role="list"', function () {
+		var checkArgs = checkSetup('<dl role="list"><dt id="target">My list item</dl>');
+		assert.isTrue(checks.dlitem.evaluate.apply(null, checkArgs));
+	})
+
+	it('should fail if the dt element has a parent <dl> with role="presentation"', function () {
+		var checkArgs = checkSetup('<dl role="presentation"><dt id="target">My list item</dl>');
+		assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
+	});
+
+	it('should fail if the dt element has a parent <dl> with a changed role', function(){
+		var checkArgs = checkSetup('<dl role="menubar"><dt id="target">My list item</dl>');
+		assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<dt>My list item </dt>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
+
+		var checkArgs = checkSetup(node, 'dt');
+		assert.isTrue(checks.dlitem.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<dt>My list item </dt>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div><slot></slot></div>';
+
+		var checkArgs = checkSetup(node, 'dt');
+		assert.isFalse(checks.dlitem.evaluate.apply(null, checkArgs));
+	});
 });
+
+
diff --git a/test/checks/lists/listitem.js b/test/checks/lists/listitem.js
index 19af87c877..751bd6b6e9 100644
--- a/test/checks/lists/listitem.js
+++ b/test/checks/lists/listitem.js
@@ -1,63 +1,55 @@
-describe('listitem', function() {
+describe('listitem', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
 	var checkSetup = axe.testUtils.checkSetup;
 	var shadowSupport = axe.testUtils.shadowSupport;
 
-	afterEach(function() {
+	afterEach(function () {
 		fixture.innerHTML = '';
 	});
 
-	it('should pass if the listitem has a parent <ol>', function() {
+	it('should pass if the listitem has a parent <ol>', function () {
 		var checkArgs = checkSetup('<ol><li id="target">My list item</li></ol>');
-
 		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
-	it('should pass if the listitem has a parent <ul>', function() {
+	it('should pass if the listitem has a parent <ul>', function () {
 		var checkArgs = checkSetup('<ul><li id="target">My list item</li></ul>');
-
 		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
-	it('should pass if the listitem has a parent role=list', function() {
-		var checkArgs = checkSetup(
-			'<div role="list"><li id="target">My list item</li></div>'
-		);
-
+	it('should pass if the listitem has a parent role=list', function () {
+		var checkArgs = checkSetup('<div role="list"><li id="target">My list item</li></div>');
 		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
-	it('should fail if the listitem has an incorrect parent', function() {
+	it('should fail if the listitem has an incorrect parent', function () {
 		var checkArgs = checkSetup('<div><li id="target">My list item</li></div>');
+		assert.isFalse(checks.listitem.evaluate.apply(null, checkArgs));
+	});
+
+	it('should fail if the listitem has a parent <ol> with changed role', function () {
+		var checkArgs = checkSetup('<ol role="menubar"><li id="target">My list item</li></ol>');
+		assert.isFalse(checks.listitem.evaluate.apply(null, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<li>My list item </li>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
+		var checkArgs = checkSetup(node, 'li');
+		assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
+	});
 
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<li>My list item </li>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<div><slot></slot></div>';
+		var checkArgs = checkSetup(node, 'li');
 		assert.isFalse(checks.listitem.evaluate.apply(null, checkArgs));
 	});
 
-	(shadowSupport.v1 ? it : xit)(
-		'should return true in a shadow DOM pass',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<li>My list item </li>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<ul><slot></slot></ul>';
-
-			var checkArgs = checkSetup(node, 'li');
-			assert.isTrue(checks.listitem.evaluate.apply(null, checkArgs));
-		}
-	);
-
-	(shadowSupport.v1 ? it : xit)(
-		'should return false in a shadow DOM fail',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<li>My list item </li>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<div><slot></slot></div>';
-
-			var checkArgs = checkSetup(node, 'li');
-			assert.isFalse(checks.listitem.evaluate.apply(null, checkArgs));
-		}
-	);
 });
diff --git a/test/checks/lists/only-dlitems.js b/test/checks/lists/only-dlitems.js
index 28ebb6d426..624624d204 100644
--- a/test/checks/lists/only-dlitems.js
+++ b/test/checks/lists/only-dlitems.js
@@ -1,4 +1,4 @@
-describe('only-dlitems', function() {
+describe('only-dlitems', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
@@ -7,173 +7,132 @@ describe('only-dlitems', function() {
 
 	var checkContext = axe.testUtils.MockCheckContext();
 
-	afterEach(function() {
+	afterEach(function () {
 		fixture.innerHTML = '';
 		checkContext.reset();
 	});
 
-	it('should return false if the list has no contents', function() {
+	it('should return false if the list has no contents', function () {
 		var checkArgs = checkSetup('<dl id="target"></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return true if the list has non-dd/dt contents', function() {
+	it('should return true if the list has non-dd/dt contents', function () {
 		var checkArgs = checkSetup('<dl id="target"><p>Not a list</p></dl>');
 
-		assert.isTrue(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
-	it('should return false if the list has only a dd', function() {
+	it('should return true if the list has non-dd content through role change', function () {
+		var checkArgs = checkSetup('<dl id="target"><dd role="menuitem">Not a list</dd></dl>');
+
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should return true if the list has non-dt content through role change', function () {
+		var checkArgs = checkSetup('<dl id="target"><dt role="menuitem">Not a list</dt></dl>');
+
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should return false if the list has only a dd', function () {
 		var checkArgs = checkSetup('<dl id="target"><dd>A list</dd></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should return true if <link> is used along side dt with its role changed', function () {
+		var checkArgs = checkSetup('<dl id="target"><link rel="stylesheet" href="theme.css"><dt role="menuitem">A list</dt></dl>');
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if the list has only a dt', function() {
+	it('should return false if the list has only a dt', function () {
 		var checkArgs = checkSetup('<dl id="target"><dt>A list</dt></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if the list has dt and dd with child content', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><dt><p>An item</p></dt><dd>A list</dd></dl>'
-		);
+	it('should return false if the list has dt and dd with child content', function () {
+		var checkArgs = checkSetup('<dl id="target"><dt><p>An item</p></dt><dd>A list</dd></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if the list has dt and dd', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><dt>An item</dt><dd>A list</dd></dl>'
-		);
+	it('should return false if the list has dt and dd', function () {
+		var checkArgs = checkSetup('<dl id="target"><dt>An item</dt><dd>A list</dd></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if the list has dt, dd and a comment', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><dt>An item</dt><dd>A list</dd><!-- foo --></dl>'
-		);
+	it('should return false if the list has dt, dd and a comment', function () {
+		var checkArgs = checkSetup('<dl id="target"><dt>An item</dt><dd>A list</dd><!-- foo --></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return true if the list has a dt and dd with other content', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><dt>Item one</dt><dd>Description</dd><p>Not a list</p></dl>'
-		);
+	it('should return true if the list has a dt and dd with other content', function () {
+		var checkArgs = checkSetup('<dl id="target"><dt>Item one</dt><dd>Description</dd><p>Not a list</p></dl>');
 
-		assert.isTrue(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
-	it('should return true if the list has a textNode as a child', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><!--hi--><dt>hi</dt>hello<dd>hi</dd></dl>'
-		);
+	it('should return true if the list has a textNode as a child', function () {
+		var checkArgs = checkSetup('<dl id="target"><!--hi--><dt>hi</dt>hello<dd>hi</dd></dl>');
 
-		assert.isTrue(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._relatedNodes, []);
 	});
 
-	it('should return false if <link> is used along side dt', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><link rel="stylesheet" href="theme.css"><dt>A list</dt></dl>'
-		);
+	it('should return false if <link> is used along side dt', function () {
+		var checkArgs = checkSetup('<dl id="target"><link rel="stylesheet" href="theme.css"><dt>A list</dt></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <meta> is used along side dt', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><meta name="description" content=""><dt>A list</dt></dl>'
-		);
+	it('should return false if <meta> is used along side dt', function () {
+		var checkArgs = checkSetup('<dl id="target"><meta name="description" content=""><dt>A list</dt></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <script> is used along side dt', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><script src="script.js"></script><dt>A list</dt></dl>'
-		);
+	it('should return false if <script> is used along side dt', function () {
+		var checkArgs = checkSetup('<dl id="target"><script src="script.js"></script><dt>A list</dt></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <style> is used along side dt', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><style></style><dt>A list</dt></dl>'
-		);
+	it('should return false if <style> is used along side dt', function () {
+		var checkArgs = checkSetup('<dl id="target"><style></style><dt>A list</dt></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <template> is used along side dt', function() {
-		var checkArgs = checkSetup(
-			'<dl id="target"><template></template><dt>A list</dt></dl>'
-		);
+	it('should return false if <template> is used along side dt', function () {
+		var checkArgs = checkSetup('<dl id="target"><template></template><dt>A list</dt></dl>');
 
-		assert.isFalse(
-			checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	(shadowSupport.v1 ? it : xit)(
-		'should return false in a shadow DOM pass',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<dt>My list item </dt>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<dl><slot></slot></dl>';
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<dt>My list item </dt>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
 
-			var checkArgs = checkSetup(node, 'dl');
-			assert.isFalse(
-				checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-			);
-		}
-	);
+		var checkArgs = checkSetup(node, 'dl');
+		assert.isFalse(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+	});
 
-	(shadowSupport.v1 ? it : xit)(
-		'should return true in a shadow DOM fail',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<p>Not a list</p>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<dl><slot></slot></dl>';
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<p>Not a list</p>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<dl><slot></slot></dl>';
 
-			var checkArgs = checkSetup(node, 'dl');
-			assert.isTrue(
-				checks['only-dlitems'].evaluate.apply(checkContext, checkArgs)
-			);
-		}
-	);
+		var checkArgs = checkSetup(node, 'dl');
+		assert.isTrue(checks['only-dlitems'].evaluate.apply(checkContext, checkArgs));
+	});
 });
diff --git a/test/checks/lists/only-listitems.js b/test/checks/lists/only-listitems.js
index 7e70bd7ac7..ef7b864e14 100644
--- a/test/checks/lists/only-listitems.js
+++ b/test/checks/lists/only-listitems.js
@@ -1,4 +1,4 @@
-describe('only-listitems', function() {
+describe('only-listitems', function () {
 	'use strict';
 
 	var fixture = document.getElementById('fixture');
@@ -7,158 +7,144 @@ describe('only-listitems', function() {
 
 	var checkContext = axe.testUtils.MockCheckContext();
 
-	afterEach(function() {
+	afterEach(function () {
 		fixture.innerHTML = '';
 		checkContext.reset();
 	});
 
-	it('should return false if the list has no contents', function() {
+	it('should return false if the list has no contents', function () {
 		var checkArgs = checkSetup('<ol id="target"></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if the list has whitespace', function() {
+	it('should return false if the list has only spaces as content', function () {
+		var checkArgs = checkSetup('<ol id="target">   </ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should return false if the list has whitespace', function () {
 		var checkArgs = checkSetup('<ol id="target"><li>Item</li>    </ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should return false if the list has only an element with role listitem', function () {
+		var checkArgs = checkSetup('<ol id="target"><div role="listitem">A list</div></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if the list has non-li comments', function() {
-		var checkArgs = checkSetup(
-			'<ol id="target"><li>Item</li><!--comment--></ol>'
-		);
+	it('should return false if the list has only multiple mixed elements with role listitem', function () {
+		var checkArgs = checkSetup('<ol id="target"><div role="listitem">list</div><li role="listitem">list</li><div role="listitem">list</div></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return true if the list has non-li text contents', function() {
+	it('should return false if the list has non-li comments', function () {
+		var checkArgs = checkSetup('<ol id="target"><li>Item</li><!--comment--></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should return true if the list has non-li text contents', function () {
 		var checkArgs = checkSetup('<ol id="target"><li>Item</li>Not an item</ol>');
 
-		assert.isTrue(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return true if the list has non-li contents', function() {
+	it('should return true if the list has non-li contents', function () {
 		var checkArgs = checkSetup('<ol id="target"><p>Not a list</p></ol>');
 
-		assert.isTrue(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
-	it('should return false if the list has only an li with child content', function() {
+	it('should return false if the list has only an li with child content', function () {
 		var checkArgs = checkSetup('<ol id="target"><li>A <i>list</i></li></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if the list has only an li', function() {
+	it('should return false if the list has only an li', function () {
 		var checkArgs = checkSetup('<ol id="target"><li>A list</li></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return true if the list has an li with other content', function() {
-		var checkArgs = checkSetup(
-			'<ol id="target"><li>A list</li><p>Not a list</p></ol>'
-		);
+	it('should return true if the list has an li with other content', function () {
+		var checkArgs = checkSetup('<ol id="target"><li>A list</li><p>Not a list</p></ol>');
 
-		assert.isTrue(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 		assert.deepEqual(checkContext._relatedNodes, [fixture.querySelector('p')]);
 	});
 
-	it('should return false if <link> is used along side li', function() {
-		var checkArgs = checkSetup(
-			'<ol id="target"><link rel="stylesheet" href="theme.css"><li>A list</li></ol>'
-		);
+	it('should return false if the list has at least one li while others have their roles changed', function () {
+		var checkArgs = checkSetup('<ol id="target"><li >A list item</li><li role="menuitem">Not a list item</li></ol>');
+	
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+	it('should return true if the list has only li items with their roles changed', function () {
+		var checkArgs = checkSetup('<ol id="target"><li role="menuitem">Not a list item</li><li role="menuitem">Not a list item</li></ol>');
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <meta> is used along side li', function() {
-		var checkArgs = checkSetup(
-			'<ol id="target"><meta name="description" content=""><li>A list</li></ol>'
-		);
+	it('should return true if <link> is used along side only li items with their roles changed', function () {
+		var checkArgs = checkSetup('<ol id="target"><link rel="stylesheet" href="theme.css"><li role="menuitem">Not a list item</li></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <script> is used along side li', function() {
-		var checkArgs = checkSetup(
-			'<ol id="target"><script src="script.js"></script><li>A list</li></ol>'
-		);
+	it('should return false if <link> is used along side li', function () {
+		var checkArgs = checkSetup('<ol id="target"><link rel="stylesheet" href="theme.css"><li>A list</li></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <style> is used along side li', function() {
-		var checkArgs = checkSetup(
-			'<ol id="target"><style></style><li>A list</li></ol>'
-		);
+	it('should return false if <meta> is used along side li', function () {
+		var checkArgs = checkSetup('<ol id="target"><meta name="description" content=""><li>A list</li></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	it('should return false if <template> is used along side li', function() {
-		var checkArgs = checkSetup(
-			'<ol id="target"><template></template><li>A list</li></ol>'
-		);
+	it('should return false if <script> is used along side li', function () {
+		var checkArgs = checkSetup('<ol id="target"><script src="script.js"></script><li>A list</li></ol>');
 
-		assert.isFalse(
-			checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-		);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
 	});
 
-	(shadowSupport.v1 ? it : xit)(
-		'should return false in a shadow DOM pass',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<li>My list item </li>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<ul><slot></slot></ul>';
+	it('should return false if <style> is used along side li', function () {
+		var checkArgs = checkSetup('<ol id="target"><style></style><li>A list</li></ol>');
 
-			var checkArgs = checkSetup(node, 'ul');
-			assert.isFalse(
-				checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-			);
-		}
-	);
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	it('should return false if <template> is used along side li', function () {
+		var checkArgs = checkSetup('<ol id="target"><template></template><li>A list</li></ol>');
+
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return false in a shadow DOM pass', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<li>My list item </li>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
 
-	(shadowSupport.v1 ? it : xit)(
-		'should return true in a shadow DOM fail',
-		function() {
-			var node = document.createElement('div');
-			node.innerHTML = '<p>Not a list item</p>';
-			var shadow = node.attachShadow({ mode: 'open' });
-			shadow.innerHTML = '<ul><slot></slot></ul>';
+		var checkArgs = checkSetup(node, 'ul');
+		assert.isFalse(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
+
+	(shadowSupport.v1 ? it : xit)('should return true in a shadow DOM fail', function () {
+		var node = document.createElement('div');
+		node.innerHTML = '<p>Not a list item</p>';
+		var shadow = node.attachShadow({ mode: 'open' });
+		shadow.innerHTML = '<ul><slot></slot></ul>';
+
+		var checkArgs = checkSetup(node, 'ul');
+		assert.isTrue(checks['only-listitems'].evaluate.apply(checkContext, checkArgs));
+	});
 
-			var checkArgs = checkSetup(node, 'ul');
-			assert.isTrue(
-				checks['only-listitems'].evaluate.apply(checkContext, checkArgs)
-			);
-		}
-	);
 });
diff --git a/test/core/utils/flattened-tree.js b/test/core/utils/flattened-tree.js
index 663068c35c..287e208a42 100644
--- a/test/core/utils/flattened-tree.js
+++ b/test/core/utils/flattened-tree.js
@@ -287,9 +287,9 @@ describe('axe.utils.getFlattenedTree', function() {
 			});
 		});
 	} else {
-		it('does not throw when slot elements are used', function () {
+		it('does not throw when slot elements are used', function() {
 			fixture.innerHTML = '<button><slot></slot></button>';
-			assert.doesNotThrow(function () {
+			assert.doesNotThrow(function() {
 				axe.utils.getFlattenedTree(fixture);
 			});
 		});
diff --git a/test/integration/rules/definition-list/definition-list.html b/test/integration/rules/definition-list/definition-list.html
index 8581722c20..e486ab404a 100644
--- a/test/integration/rules/definition-list/definition-list.html
+++ b/test/integration/rules/definition-list/definition-list.html
@@ -1,6 +1,7 @@
-
-<dl id="emptydl">  </dl>
-<dl id="divdl"><div>This shouldn't be here.</div></dl>
+<dl id="emptydl"> </dl>
+<dl id="divdl">
+	<div>This shouldn't be here.</div>
+</dl>
 <dl id="mixeddl">
 	<dt>Correct.</dt>
 	<dd>Correct.</dd>
@@ -42,3 +43,11 @@
 	</template>
 	<p>para</p>
 </dl>
+<dl id="ddrolechanged">
+	<dd role="menuitem">Thingy</dd>
+	<dt>Thing</dt>
+</dl>
+<dl id="dtrolechanged">
+	<dd>Thingy</dd>
+	<dt role="menuitem">Thing</dt>
+</dl>
\ No newline at end of file
diff --git a/test/integration/rules/definition-list/definition-list.json b/test/integration/rules/definition-list/definition-list.json
index 6f3825225e..f7a8612fc3 100644
--- a/test/integration/rules/definition-list/definition-list.json
+++ b/test/integration/rules/definition-list/definition-list.json
@@ -1,6 +1,6 @@
 {
 	"description": "definition-list test",
 	"rule": "definition-list",
-	"violations": [["#divdl"], ["#mixeddl"], ["#unordereddl"], ["#mixedscriptdl"]],
+	"violations": [["#divdl"], ["#mixeddl"], ["#unordereddl"], ["#mixedscriptdl"], ["#ddrolechanged"], ["#dtrolechanged"]],
 	"passes": [["#emptydl"], ["#repeatdl"], ["#properdl"], ["#scriptdl"], ["#emptyscriptdl"]]
 }
diff --git a/test/integration/rules/dlitem/dlitem.html b/test/integration/rules/dlitem/dlitem.html
index d20c8216b2..3c92602827 100644
--- a/test/integration/rules/dlitem/dlitem.html
+++ b/test/integration/rules/dlitem/dlitem.html
@@ -1,5 +1,10 @@
 <dd id="uncontained">Should belong to a list.</dd>
 <dt id="alsouncontained">Should belong to a list.</dt>
-<dl><dt id="contained">Does belong to a list.</dt>
+<dl>
+	<dt id="contained">Does belong to a list.</dt>
 	<dd id="alsocontained">Also belongs to a list.</dd>
 </dl>
+<dl role="menubar">
+	<dt id="uncontainedbyrole">Not part of a list.</dt>
+	<dd id="alsouncontainedbyrole">Also not part of a list.</dd>
+</dl>
\ No newline at end of file
diff --git a/test/integration/rules/dlitem/dlitem.json b/test/integration/rules/dlitem/dlitem.json
index 077ae72432..ff8b0a06fe 100644
--- a/test/integration/rules/dlitem/dlitem.json
+++ b/test/integration/rules/dlitem/dlitem.json
@@ -1,6 +1,6 @@
 {
 	"description": "dlitem test",
 	"rule": "dlitem",
-	"violations": [["#uncontained"], ["#alsouncontained"]],
+	"violations": [["#uncontained"], ["#alsouncontained"],["#uncontainedbyrole"],["#alsouncontainedbyrole"]],
 	"passes": [["#contained"], ["#alsocontained"]]
 }
diff --git a/test/integration/rules/list/list.html b/test/integration/rules/list/list.html
index ae252124c4..b1e2762e82 100644
--- a/test/integration/rules/list/list.html
+++ b/test/integration/rules/list/list.html
@@ -1,19 +1,60 @@
-
-<ul id="emptyul">  </ul>
-<ul id="scriptemptyul"><script></script><template></template>  </ul>
-<ul id="divul"><div>This shouldn't be here.</div></ul>
+<ul id="emptyul"> </ul>
+<ul id="scriptemptyul">
+	<script></script>
+	<template></template>
+</ul>
+<ul id="divul">
+	<div>This shouldn't be here.</div>
+</ul>
 <ul id="mixedul">
 	<li>Correct.</li>
 	<div>Wrong.</div>
 </ul>
-<ul id="properul"><li>One.</li><li>Two.</li></ul>
-<ul id="scriptproperul"><script></script><template></template><li>One.</li><li>Two.</li></ul>
-<ol id="emptyol">  </ol>
-<ol id="scriptemptyol"><script></script><template></template>  </ol>
-<ol id="divol"><div>This shouldn't be here.</div></ol>
+<ul id="properul">
+	<li>One.</li>
+	<li>Two.</li>
+</ul>
+<ul id="scriptproperul">
+	<script></script>
+	<template></template>
+	<li>One.</li>
+	<li>Two.</li>
+</ul>
+<ol id="emptyol"> </ol>
+<ol id="scriptemptyol">
+	<script></script>
+	<template></template>
+</ol>
+<ol id="divol">
+	<div>This shouldn't be here.</div>
+</ol>
 <ol id="mixedol">
 	<li>Correct.</li>
 	<div>Wrong.</div>
 </ol>
-<ol id="properol"><li>One.</li><li>Two.</li></ol>
-<ol id="scriptproperol"><script></script><template></template><li>One.</li><li>Two.</li></ol>
+<ol id="properol">
+	<li>One.</li>
+	<li>Two.</li>
+</ol>
+<ol id="scriptproperol">
+	<script></script>
+	<template></template>
+	<li>One.</li>
+	<li>Two.</li>
+</ol>
+<ul id="ulrolledallli">
+	<li role="menuitem">One.</li>
+	<li role="menuitem">Two.</li>
+</ul>
+<ul id="ulrolledli">
+	<li>One.</li>
+	<li role="menuitem">Two</li>
+</ul>
+<ol id="olrolledallli">
+	<li role="menuitem">One.</li>
+	<li role="menuitem">Two.</li>
+</ol>
+<ol id="olrolledli">
+	<li>One.</li>
+	<li role="menuitem">Two</li>
+</ol>
\ No newline at end of file
diff --git a/test/integration/rules/list/list.json b/test/integration/rules/list/list.json
index 53e4645890..b0cfc24114 100644
--- a/test/integration/rules/list/list.json
+++ b/test/integration/rules/list/list.json
@@ -1,8 +1,6 @@
 {
 	"description": "list test",
 	"rule": "list",
-	"violations": [["#divul"], ["#mixedul"],
-		["#divol"], ["#mixedol"]],
-	"passes": [["#emptyul"], ["#scriptemptyul"], ["#properul"], ["#scriptproperul"],
-		["#emptyol"], ["#scriptemptyol"], ["#properol"], ["#scriptproperol"]]
+	"violations": [["#divul"], ["#mixedul"], ["#divol"], ["#mixedol"], ["#ulrolledallli"], ["#olrolledallli"]],
+	"passes": [["#emptyul"], ["#scriptemptyul"], ["#properul"], ["#scriptproperul"], ["#emptyol"], ["#scriptemptyol"], ["#properol"], ["#scriptproperol"], ["#ulrolledli"], ["#olrolledli"]]
 }
diff --git a/test/integration/rules/listitem/listitem.html b/test/integration/rules/listitem/listitem.html
index 06ebb7d11e..8550b9fb0f 100644
--- a/test/integration/rules/listitem/listitem.html
+++ b/test/integration/rules/listitem/listitem.html
@@ -1,4 +1,14 @@
-
-<li id="uncontained">Should belong to a list.</li>
-<ul><li id="contained">Does belong to a list.</li></ul>
-<ol><li id="alsocontained">Also belongs toa  list.</li></ol>
+<li id="uncontained">
+	Should belong to a list.</li>
+<ul>
+	<li id="contained">Does belong to a list.</li>
+</ul>
+<ol>
+	<li id="alsocontained">Also belongs to a list.</li>
+</ol>
+<ul role="menubar">
+	<li id="ulrolechanged">Also does not belong to a list.</li>
+</ul>
+<ol role="menubar">
+	<li id="olrolechanged">I too do not belong to a list.</li>
+</ol>
\ No newline at end of file
diff --git a/test/integration/rules/listitem/listitem.json b/test/integration/rules/listitem/listitem.json
index 2cf761638f..036d4dc42e 100644
--- a/test/integration/rules/listitem/listitem.json
+++ b/test/integration/rules/listitem/listitem.json
@@ -1,6 +1,6 @@
 {
 	"description": "listitem test",
 	"rule": "listitem",
-	"violations": [["#uncontained"]],
+	"violations": [["#uncontained"], ["#ulrolechanged"], ["#olrolechanged"]],
 	"passes": [["#contained"], ["#alsocontained"]]
 }