diff --git a/atest/acceptance/keywords/expected_conditions.robot b/atest/acceptance/keywords/expected_conditions.robot
index c3ec60cb6..afdc1d1e3 100644
--- a/atest/acceptance/keywords/expected_conditions.robot
+++ b/atest/acceptance/keywords/expected_conditions.robot
@@ -44,4 +44,9 @@ Wait For Non Existing Expected Conditions
     Run Keyword And Expect Error   this_is_not_an_expected_con_dition is an unknown expected condition
     ...  Wait For Expected Condition  this_is not an expected con dition  ${dynamic_btn}
 
-
+Wait For Expected Conditions When Condition Includes Locator
+    Title Should Be    Original
+    ${byElem}=  Evaluate  ("id","added_btn")
+    Click Element    link:delayed add element
+    Wait For Expected Condition    Presence Of Element Located    ${byElem}
+    Click Element    id:added_btn
\ No newline at end of file
diff --git a/atest/resources/html/javascript/expected_conditions.html b/atest/resources/html/javascript/expected_conditions.html
index 9e2a38f39..621421e83 100644
--- a/atest/resources/html/javascript/expected_conditions.html
+++ b/atest/resources/html/javascript/expected_conditions.html
@@ -3,6 +3,14 @@
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 		<title>Original</title>
+		<!-- Note the timeouts in the functions are chosen such they constitute
+		     a set with distinct subset sums. That is is a combination of any two
+		     or more were to be executed the total time for that distinct combination
+		     would be unique. This was done so we could do a ALL/AND/OR type of test
+		     and know that with the combination of expected conditions the execution
+		     was successful as the unique time took place. -->
+		<!-- The set we are using is {6,9,11,12,13} -->
+		<!-- (could also use {3,5,6,7} which would reduce total time)-->
 		<script type="text/javascript">
 		function add_content(target_container, content) {
 			p = document.createElement('p');
@@ -28,11 +36,23 @@
 				document.title='Delayed';
 			},600);
 		}
+
+		function delayed_add_element() {
+		    setTimeout(function(){
+		        const newElem = document.createElement("input");
+		        newElem.setAttribute("type", "button");
+		        newElem.setAttribute("id", "added_btn");
+		        newElem.setAttribute("value", "Added Button");
+		        const container = document.getElementById("container");
+		        document.body.insertBefore(newElem, container);
+		    },1100);
+		}
 		</script>
 	</head>
 	<body>
 		<a href="javascript:return false;" onclick="document.title='Changed'; return false;">change title</a><br/>
 		<a href="javascript:return false;" onclick="delayed_title_change(); return false;">delayed change title</a><br/>
+		<a href="javascript:return false;" onclick="delayed_add_element(); return fales;">delayed add element</a><br/>
 		<a href="javascript:return false;" onclick="add_content('target', 'added content'); return false;">add content</a><br/>
 		<a id="unicode" href="javascript:return false;" onclick="document.title='äää'; return false;">title to ääää</a><br/>
 		<p>
@@ -56,6 +76,9 @@
 			<input type=button id=enabledDisabledBtn value="Disabled"
 			disabled />
 		</p>
+		<p>
+			<div id="container"></div>
+		</p>
 		<p>
 			<form name=titleChanger>
 				<td>
